projects/dil: trunk/src/dil/Parser.d annotate

annotate trunk/src/dil/Parser.d @ 505:3bb94ba21490

Refactored a great amount of code. Changed many declaration types from Token* to Identifier*. Fix in parseStructInitializer(): append null to idents in else body. Fixed class Parameter and parseParameterList().

author	Aziz K?ksal <aziz.koeksal@gmail.com>
date	Wed, 12 Dec 2007 02:25:42 +0100
parents	9076c4cea2a4
children	996041463028

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:
483 180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	348 // IntegralType
496 5a607597dc22 Improved error recovery in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 495 diff changeset	349 case T.Char, T.Wchar, T.Dchar, T.Bool,
5a607597dc22 Improved error recovery in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 495 diff changeset	350 T.Byte, T.Ubyte, T.Short, T.Ushort,
5a607597dc22 Improved error recovery in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 495 diff changeset	351 T.Int, T.Uint, T.Long, T.Ulong,
192 5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	352 T.Float, T.Double, T.Real,
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	353 T.Ifloat, T.Idouble, T.Ireal,
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	354 T.Cfloat, T.Cdouble, T.Creal, T.Void:
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	355 case_Declaration:
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	356 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	357 /+case T.Module:
150 753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	358 // 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	359 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	360 default:
496 5a607597dc22 Improved error recovery in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 495 diff changeset	361 decl = new IllegalDeclaration();
5a607597dc22 Improved error recovery in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 495 diff changeset	362 // Skip to next valid token.
5a607597dc22 Improved error recovery in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 495 diff changeset	363 do
5a607597dc22 Improved error recovery in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 495 diff changeset	364 nT();
5a607597dc22 Improved error recovery in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 495 diff changeset	365 while (!token.isDeclDefStart &&
5a607597dc22 Improved error recovery in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 495 diff changeset	366 token.type != T.RBrace &&
5a607597dc22 Improved error recovery in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 495 diff changeset	367 token.type != T.EOF)
5a607597dc22 Improved error recovery in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 495 diff changeset	368 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	369 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	370 }
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	371 decl.setProtection(this.protection);
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	372 decl.setStorageClass(this.storageClass);
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	373 assert(!isNodeSet(decl));
262 0f22269e76ff - Changed some string types to Token. aziz* parents: 261 diff changeset	374 set(decl, begin);
129 a9244d409652 - Added class EmptyDeclaration. aziz parents: 128 diff changeset	375 return decl;
102 6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	376 }
6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	377
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	378 /++
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	379 DeclarationsBlock:
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	380 : DeclDefs
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	381 { }
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	382 { DeclDefs }
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	383 DeclDef
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	384 +/
404 fe46b5ea7a18 Added method parseDeclarationsBlockNoColon(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 400 diff changeset	385 Declaration parseDeclarationsBlock(bool noColon = false)
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	386 {
305 df237b3b5f09 - Added class Declarations. aziz parents: 304 diff changeset	387 Declaration d;
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	388 switch (token.type)
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	389 {
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	390 case T.LBrace:
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	391 nT();
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	392 auto begin = token;
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	393 auto decls = new Declarations;
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	394 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	395 decls ~= parseDeclarationDefinition();
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	396 require(T.RBrace);
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	397 d = set(decls, begin);
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	398 break;
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	399 case T.Colon:
404 fe46b5ea7a18 Added method parseDeclarationsBlockNoColon(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 400 diff changeset	400 if (noColon == true)
fe46b5ea7a18 Added method parseDeclarationsBlockNoColon(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 400 diff changeset	401 goto default;
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	402 nT();
484 265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	403 auto begin = token;
305 df237b3b5f09 - Added class Declarations. aziz parents: 304 diff changeset	404 auto decls = new Declarations;
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	405 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	406 decls ~= parseDeclarationDefinition();
484 265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	407 d = set(decls, begin);
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	408 break;
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	409 default:
305 df237b3b5f09 - Added class Declarations. aziz parents: 304 diff changeset	410 d = parseDeclarationDefinition();
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	411 }
484 265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	412 assert(isNodeSet(d));
305 df237b3b5f09 - Added class Declarations. aziz parents: 304 diff changeset	413 return d;
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	414 }
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	415
404 fe46b5ea7a18 Added method parseDeclarationsBlockNoColon(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 400 diff changeset	416 Declaration parseDeclarationsBlockNoColon()
fe46b5ea7a18 Added method parseDeclarationsBlockNoColon(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 400 diff changeset	417 {
fe46b5ea7a18 Added method parseDeclarationsBlockNoColon(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 400 diff changeset	418 return parseDeclarationsBlock(true);
fe46b5ea7a18 Added method parseDeclarationsBlockNoColon(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 400 diff changeset	419 }
fe46b5ea7a18 Added method parseDeclarationsBlockNoColon(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 400 diff changeset	420
483 180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	421 /++
180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	422 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	423 Params:
180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	424 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	425 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	426 +/
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	427 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	428 Protection protection = Protection.None,
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	429 LinkageType linkType = LinkageType.None,
501 949a53332c66 Fixed parsing of AutoDeclarations. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 496 diff changeset	430 bool testAutoDeclaration = false,
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	431 bool optionalParameterList = true)
192 5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	432 {
483 180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	433 auto begin = token;
202 8aecf8925c5f - Added code for parsing AutoDeclaration in parseDeclaration(). aziz parents: 201 diff changeset	434 Type type;
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	435 Identifier* ident;
192 5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	436
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	437 // Check for AutoDeclaration: StorageClasses Identifier =
501 949a53332c66 Fixed parsing of AutoDeclarations. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 496 diff changeset	438 if (testAutoDeclaration &&
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	439 token.type == T.Identifier &&
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	440 peekNext() == T.Assign)
192 5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	441 {
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	442 ident = token.ident;
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	443 nT();
202 8aecf8925c5f - Added code for parsing AutoDeclaration in parseDeclaration(). aziz parents: 201 diff changeset	444 }
8aecf8925c5f - Added code for parsing AutoDeclaration in parseDeclaration(). aziz parents: 201 diff changeset	445 else
8aecf8925c5f - Added code for parsing AutoDeclaration in parseDeclaration(). aziz parents: 201 diff changeset	446 {
8aecf8925c5f - Added code for parsing AutoDeclaration in parseDeclaration(). aziz parents: 201 diff changeset	447 type = parseType();
8aecf8925c5f - Added code for parsing AutoDeclaration in parseDeclaration(). aziz parents: 201 diff changeset	448 if (token.type == T.LParen)
8aecf8925c5f - Added code for parsing AutoDeclaration in parseDeclaration(). aziz parents: 201 diff changeset	449 {
483 180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	450 // 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	451 // 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	452 // Example:
180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	453 // void foo() {
180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	454 // // 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	455 // some_type (*p_func)(int);
180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	456 // // 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	457 // 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	458 // }
180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	459 // // 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	460 // something(*p);
180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	461 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	462 }
b18b0cd8f8cd Fixed parsing C function pointers in declarations. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 414 diff changeset	463 else
b18b0cd8f8cd Fixed parsing C function pointers in declarations. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 414 diff changeset	464 {
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	465 ident = requireIdentifier(MSG.ExpectedFunctionName);
415 b18b0cd8f8cd Fixed parsing C function pointers in declarations. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 414 diff changeset	466 // Type FunctionName ( ParameterList ) FunctionBody
b18b0cd8f8cd Fixed parsing C function pointers in declarations. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 414 diff changeset	467 if (token.type == T.LParen)
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	468 {
415 b18b0cd8f8cd Fixed parsing C function pointers in declarations. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 414 diff changeset	469 // It's a function declaration
b18b0cd8f8cd Fixed parsing C function pointers in declarations. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 414 diff changeset	470 TemplateParameters tparams;
b18b0cd8f8cd Fixed parsing C function pointers in declarations. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 414 diff changeset	471 if (tokenAfterParenIs(T.LParen))
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 // ( TemplateParameterList ) ( ParameterList )
b18b0cd8f8cd Fixed parsing C function pointers in declarations. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 414 diff changeset	474 tparams = parseTemplateParameterList();
b18b0cd8f8cd Fixed parsing C function pointers in declarations. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 414 diff changeset	475 }
b18b0cd8f8cd Fixed parsing C function pointers in declarations. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 414 diff changeset	476
b18b0cd8f8cd Fixed parsing C function pointers in declarations. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 414 diff changeset	477 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	478 version(D2)
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 491 diff changeset	479 {
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 491 diff changeset	480 switch (token.type)
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 491 diff changeset	481 {
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 491 diff changeset	482 case T.Const:
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 491 diff changeset	483 stc \|= StorageClass.Const;
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 case T.Invariant:
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 491 diff changeset	487 stc \|= StorageClass.Invariant;
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 491 diff changeset	488 nT();
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 491 diff changeset	489 break;
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 491 diff changeset	490 default:
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 491 diff changeset	491 }
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 491 diff changeset	492 }
415 b18b0cd8f8cd Fixed parsing C function pointers in declarations. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 414 diff changeset	493 // ReturnType FunctionName ( ParameterList )
b18b0cd8f8cd Fixed parsing C function pointers in declarations. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 414 diff changeset	494 auto funcBody = parseFunctionBody();
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	495 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	496 d.setStorageClass(stc);
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	497 d.setLinkageType(linkType);
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	498 d.setProtection(protection);
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	499 return set(d, begin);
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	500 }
415 b18b0cd8f8cd Fixed parsing C function pointers in declarations. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 414 diff changeset	501 type = parseDeclaratorSuffix(type);
202 8aecf8925c5f - Added code for parsing AutoDeclaration in parseDeclaration(). aziz parents: 201 diff changeset	502 }
192 5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	503 }
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	504
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	505 // It's a variable declaration.
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	506 Identifier*[] idents = [ident];
194 b3604b237292 - Implemented parsing variable declarations. aziz parents: 193 diff changeset	507 Expression[] values;
199 a95fee6e4b7e - Fix: parseDeclaration(): appending null to values when no initializer present. aziz parents: 198 diff changeset	508 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	509 while (token.type == T.Comma)
b3604b237292 - Implemented parsing variable declarations. aziz parents: 193 diff changeset	510 {
222 4f31e4671e06 - Fix: nT() wasn't called in while loop to skip T.Comma. aziz parents: 220 diff changeset	511 nT();
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	512 idents ~= requireIdentifier(MSG.ExpectedVariableName);
194 b3604b237292 - Implemented parsing variable declarations. aziz parents: 193 diff changeset	513 LenterLoop:
b3604b237292 - Implemented parsing variable declarations. aziz parents: 193 diff changeset	514 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	515 nT(), (values ~= parseInitializer());
199 a95fee6e4b7e - Fix: parseDeclaration(): appending null to values when no initializer present. aziz parents: 198 diff changeset	516 else
a95fee6e4b7e - Fix: parseDeclaration(): appending null to values when no initializer present. aziz parents: 198 diff changeset	517 values ~= null;
194 b3604b237292 - Implemented parsing variable declarations. aziz parents: 193 diff changeset	518 }
b3604b237292 - Implemented parsing variable declarations. aziz parents: 193 diff changeset	519 require(T.Semicolon);
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	520 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	521 d.setStorageClass(stc);
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	522 d.setLinkageType(linkType);
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	523 d.setProtection(protection);
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	524 return set(d, begin);
194 b3604b237292 - Implemented parsing variable declarations. aziz parents: 193 diff changeset	525 }
192 5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	526
194 b3604b237292 - Implemented parsing variable declarations. aziz parents: 193 diff changeset	527 Expression parseInitializer()
b3604b237292 - Implemented parsing variable declarations. aziz parents: 193 diff changeset	528 {
198 88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	529 if (token.type == T.Void)
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	530 {
266 fea4e8b6cea5 - Added begin variables and calls to set(). aziz parents: 265 diff changeset	531 auto begin = token;
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	532 auto next = peekNext();
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	533 if (next == T.Comma \|\| next == T.Semicolon)
198 88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	534 {
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	535 nT();
266 fea4e8b6cea5 - Added begin variables and calls to set(). aziz parents: 265 diff changeset	536 return set(new VoidInitializer(), begin);
198 88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	537 }
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	538 }
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	539 return parseNonVoidInitializer();
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	540 }
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	541
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	542 Expression parseNonVoidInitializer()
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	543 {
266 fea4e8b6cea5 - Added begin variables and calls to set(). aziz parents: 265 diff changeset	544 auto begin = token;
198 88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	545 Expression init;
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	546 switch (token.type)
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	547 {
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	548 case T.LBracket:
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	549 // ArrayInitializer:
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	550 // [ ]
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	551 // [ ArrayMemberInitializations ]
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	552 Expression[] keys;
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	553 Expression[] values;
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	554
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	555 nT();
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	556 while (token.type != T.RBracket)
198 88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	557 {
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	558 auto e = parseNonVoidInitializer();
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	559 if (token.type == T.Colon)
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	560 {
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	561 nT();
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	562 keys ~= e;
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	563 values ~= parseNonVoidInitializer();
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	564 }
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	565 else
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	566 {
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	567 keys ~= null;
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	568 values ~= e;
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	569 }
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	570
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	571 if (token.type != T.Comma)
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	572 break;
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	573 nT();
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	574 }
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	575 require(T.RBracket);
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	576 init = new ArrayInitializer(keys, values);
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	577 break;
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	578 case T.LBrace:
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	579 // StructInitializer:
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	580 // { }
198 88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	581 // { StructMemberInitializers }
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	582 Expression parseStructInitializer()
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	583 {
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	584 Identifier*[] idents;
198 88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	585 Expression[] values;
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	586
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	587 nT();
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	588 while (token.type != T.RBrace)
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 if (token.type == T.Identifier &&
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	591 // 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	592 peekNext() == T.Colon)
198 88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	593 {
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	594 idents ~= token.ident;
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	595 nT(), nT(); // Skip Identifier :
198 88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	596 }
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	597 else
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	598 idents ~= null;
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	599
198 88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	600 // NonVoidInitializer
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	601 values ~= parseNonVoidInitializer();
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	602
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	603 if (token.type != T.Comma)
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	604 break;
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	605 nT();
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	606 }
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	607 require(T.RBrace);
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	608 return new StructInitializer(idents, values);
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	609 }
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	610
214 45fc474c1678 - Changed 'failed' parameter of try_() to 'success'. aziz parents: 213 diff changeset	611 bool success;
423 6057113f9a44 Refactored Parser.try_(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 422 diff changeset	612 auto si = try_(&parseStructInitializer, success);
214 45fc474c1678 - Changed 'failed' parameter of try_() to 'success'. aziz parents: 213 diff changeset	613 if (success)
200 61f60112ac63 - Fix: parsing AssignExpression when parsing StructInitializer failed. aziz parents: 199 diff changeset	614 {
198 88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	615 init = si;
200 61f60112ac63 - Fix: parsing AssignExpression when parsing StructInitializer failed. aziz parents: 199 diff changeset	616 break;
61f60112ac63 - Fix: parsing AssignExpression when parsing StructInitializer failed. aziz parents: 199 diff changeset	617 }
216 984d48932bce - Added class EmptyStatement. aziz parents: 214 diff changeset	618 assert(token.type == T.LBrace);
200 61f60112ac63 - Fix: parsing AssignExpression when parsing StructInitializer failed. aziz parents: 199 diff changeset	619 //goto default;
198 88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	620 default:
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	621 init = parseAssignExpression();
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	622 }
266 fea4e8b6cea5 - Added begin variables and calls to set(). aziz parents: 265 diff changeset	623 set(init, begin);
198 88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	624 return init;
192 5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	625 }
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	626
267 f3dfa6208ed3 - Removed parameter func from parseFunctionBody(). Creating new FunctionBody inside the method. aziz parents: 266 diff changeset	627 FunctionBody parseFunctionBody()
192 5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	628 {
268 c19b68a4e3db - FunctionBody inherits from Node now. aziz parents: 267 diff changeset	629 auto begin = token;
267 f3dfa6208ed3 - Removed parameter func from parseFunctionBody(). Creating new FunctionBody inside the method. aziz parents: 266 diff changeset	630 auto func = new FunctionBody;
192 5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	631 while (1)
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	632 {
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	633 switch (token.type)
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	634 {
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	635 case T.LBrace:
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	636 func.funcBody = parseStatements();
192 5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	637 break;
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	638 case T.Semicolon:
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	639 nT();
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	640 break;
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	641 case T.In:
342 f13d551d7c4f - Added error messages MID.InContract and MID.OutContract. aziz parents: 341 diff changeset	642 if (func.inBody)
f13d551d7c4f - Added error messages MID.InContract and MID.OutContract. aziz parents: 341 diff changeset	643 error(MID.InContract);
226 aa38e1401217 - Fixed cases T.Alias and T.Typedef. Wrong function called. aziz parents: 225 diff changeset	644 nT();
192 5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	645 func.inBody = parseStatements();
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	646 continue;
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	647 case T.Out:
342 f13d551d7c4f - Added error messages MID.InContract and MID.OutContract. aziz parents: 341 diff changeset	648 if (func.outBody)
f13d551d7c4f - Added error messages MID.InContract and MID.OutContract. aziz parents: 341 diff changeset	649 error(MID.OutContract);
192 5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	650 nT();
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	651 if (token.type == T.LParen)
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	652 {
226 aa38e1401217 - Fixed cases T.Alias and T.Typedef. Wrong function called. aziz parents: 225 diff changeset	653 nT();
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	654 func.outIdent = requireIdentifier(MSG.ExpectedAnIdentifier);
192 5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	655 require(T.RParen);
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	656 }
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	657 func.outBody = parseStatements();
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	658 continue;
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	659 case T.Body:
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	660 nT();
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	661 goto case T.LBrace;
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	662 default:
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	663 error(token, MSG.ExpectedFunctionBody, token.srcText);
192 5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	664 }
342 f13d551d7c4f - Added error messages MID.InContract and MID.OutContract. aziz parents: 341 diff changeset	665 break; // Exit loop.
192 5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	666 }
268 c19b68a4e3db - FunctionBody inherits from Node now. aziz parents: 267 diff changeset	667 set(func, begin);
299 559d5d62e0c1 - Added checks for null before adding member to Node.children. aziz parents: 298 diff changeset	668 func.finishConstruction();
193 2a2975b6d539 - Using parseFunctionBody() when parsing FunctionLiteralExpression. aziz parents: 192 diff changeset	669 return func;
192 5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	670 }
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	671
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	672 LinkageType parseLinkageType()
359 511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	673 {
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	674 LinkageType linkageType;
359 511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	675 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	676 return linkageType;
359 511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	677
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	678 nT(); // Skip (
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	679 if (token.type == T.RParen)
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	680 {
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	681 nT();
359 511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	682 error(MID.MissingLinkageType);
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	683 return linkageType;
359 511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	684 }
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	685
502 4e14cd1b24da Refactored code and added modules related to tabulated Identifiers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 501 diff changeset	686 auto identTok = requireId();
4e14cd1b24da Refactored code and added modules related to tabulated Identifiers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 501 diff changeset	687
4e14cd1b24da Refactored code and added modules related to tabulated Identifiers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 501 diff changeset	688 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	689
4e14cd1b24da Refactored code and added modules related to tabulated Identifiers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 501 diff changeset	690 switch (identID)
359 511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	691 {
502 4e14cd1b24da Refactored code and added modules related to tabulated Identifiers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 501 diff changeset	692 case ID.C:
359 511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	693 if (token.type == T.PlusPlus)
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	694 {
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	695 nT();
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	696 linkageType = LinkageType.Cpp;
359 511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	697 break;
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	698 }
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	699 linkageType = LinkageType.C;
359 511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	700 break;
502 4e14cd1b24da Refactored code and added modules related to tabulated Identifiers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 501 diff changeset	701 case ID.D:
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	702 linkageType = LinkageType.D;
359 511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	703 break;
502 4e14cd1b24da Refactored code and added modules related to tabulated Identifiers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 501 diff changeset	704 case ID.Windows:
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	705 linkageType = LinkageType.Windows;
359 511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	706 break;
502 4e14cd1b24da Refactored code and added modules related to tabulated Identifiers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 501 diff changeset	707 case ID.Pascal:
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	708 linkageType = LinkageType.Pascal;
359 511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	709 break;
502 4e14cd1b24da Refactored code and added modules related to tabulated Identifiers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 501 diff changeset	710 case ID.System:
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	711 linkageType = LinkageType.System;
359 511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	712 break;
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	713 default:
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	714 error(MID.UnrecognizedLinkageType, token.srcText);
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	715 }
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	716 require(T.RParen);
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	717 return linkageType;
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	718 }
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	719
496 5a607597dc22 Improved error recovery in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 495 diff changeset	720 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	721 {
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	722 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	723 prev_lt = lt;
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	724 else
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	725 // TODO: create new msg RedundantLinkageType.
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	726 error(begin, MSG.RedundantLinkageType ~ Token.textSpan(begin, this.prevToken));
359 511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	727 }
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	728
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	729 Declaration parseStorageAttribute()
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	730 {
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	731 StorageClass stc, stc_tmp;
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	732 LinkageType prev_linkageType;
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	733
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	734 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	735 // Nested function.
305 df237b3b5f09 - Added class Declarations. aziz parents: 304 diff changeset	736 Declaration parse()
238 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 Declaration decl;
359 511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	739 auto begin = token;
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	740 switch (token.type)
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	741 {
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	742 case T.Extern:
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	743 if (peekNext() != T.LParen)
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	744 {
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	745 stc_tmp = StorageClass.Extern;
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	746 goto Lcommon;
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	747 }
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 nT();
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	750 auto linkageType = parseLinkageType();
496 5a607597dc22 Improved error recovery in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 495 diff changeset	751 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	752
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	753 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	754 this.linkageType = linkageType; // Set.
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	755 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	756 set(decl, begin);
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	757 this.linkageType = saved; // Restore.
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	758 break;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	759 case T.Override:
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	760 stc_tmp = StorageClass.Override;
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	761 goto Lcommon;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	762 case T.Deprecated:
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	763 stc_tmp = StorageClass.Deprecated;
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	764 goto Lcommon;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	765 case T.Abstract:
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	766 stc_tmp = StorageClass.Abstract;
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	767 goto Lcommon;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	768 case T.Synchronized:
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	769 stc_tmp = StorageClass.Synchronized;
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	770 goto Lcommon;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	771 case T.Static:
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	772 stc_tmp = StorageClass.Static;
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	773 goto Lcommon;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	774 case T.Final:
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	775 stc_tmp = StorageClass.Final;
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	776 goto Lcommon;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	777 case T.Const:
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	778 version(D2)
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	779 {
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	780 if (peekNext() == T.LParen)
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	781 goto case_Declaration;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	782 }
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	783 stc_tmp = StorageClass.Const;
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	784 goto Lcommon;
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	785 version(D2)
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	786 {
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	787 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	788 auto next = token;
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	789 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	790 {
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	791 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	792 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	793 decl = parseDeclarationDefinition(); // invariant ( )
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	794 decl.setStorageClass(stc);
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	795 break;
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	796 }
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	797 // invariant as StorageClass.
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	798 stc_tmp = StorageClass.Invariant;
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	799 goto Lcommon;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	800 }
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	801 case T.Auto:
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	802 stc_tmp = StorageClass.Auto;
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	803 goto Lcommon;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	804 case T.Scope:
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	805 stc_tmp = StorageClass.Scope;
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	806 goto Lcommon;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	807 Lcommon:
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	808 // Issue error if redundant.
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	809 if (stc & stc_tmp)
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	810 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	811 else
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	812 stc \|= stc_tmp;
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	813
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	814 auto tok = token.type;
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	815 nT();
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	816 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	817 set(decl, begin);
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	818 break;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	819 case T.Identifier:
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	820 case_Declaration:
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	821 // 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	822 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	823 break;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	824 default:
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	825 this.storageClass = stc; // Set.
305 df237b3b5f09 - Added class Declarations. aziz parents: 304 diff changeset	826 decl = parseDeclarationsBlock();
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	827 this.storageClass = saved_storageClass; // Reset.
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	828 }
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	829 assert(isNodeSet(decl));
305 df237b3b5f09 - Added class Declarations. aziz parents: 304 diff changeset	830 return decl;
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	831 }
305 df237b3b5f09 - Added class Declarations. aziz parents: 304 diff changeset	832 return parse();
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	833 }
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	834
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	835 uint parseAlignAttribute()
260 b83180748ae6 - Added method parseAlignAttribute(). aziz parents: 259 diff changeset	836 {
b83180748ae6 - Added method parseAlignAttribute(). aziz parents: 259 diff changeset	837 assert(token.type == T.Align);
b83180748ae6 - Added method parseAlignAttribute(). aziz parents: 259 diff changeset	838 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	839 uint size = DEFAULT_ALIGN_SIZE; // Global default.
260 b83180748ae6 - Added method parseAlignAttribute(). aziz parents: 259 diff changeset	840 if (token.type == T.LParen)
b83180748ae6 - Added method parseAlignAttribute(). aziz parents: 259 diff changeset	841 {
b83180748ae6 - Added method parseAlignAttribute(). aziz parents: 259 diff changeset	842 nT();
b83180748ae6 - Added method parseAlignAttribute(). aziz parents: 259 diff changeset	843 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	844 (size = token.int_), nT();
260 b83180748ae6 - Added method parseAlignAttribute(). aziz parents: 259 diff changeset	845 else
b83180748ae6 - Added method parseAlignAttribute(). aziz parents: 259 diff changeset	846 expected(T.Int32);
b83180748ae6 - Added method parseAlignAttribute(). aziz parents: 259 diff changeset	847 require(T.RParen);
b83180748ae6 - Added method parseAlignAttribute(). aziz parents: 259 diff changeset	848 }
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	849 return size;
260 b83180748ae6 - Added method parseAlignAttribute(). aziz parents: 259 diff changeset	850 }
b83180748ae6 - Added method parseAlignAttribute(). aziz parents: 259 diff changeset	851
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	852 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	853 {
146 8180eb84e69c - Started implementation of parseAttributeSpecifier(). aziz parents: 145 diff changeset	854 Declaration decl;
8180eb84e69c - Started implementation of parseAttributeSpecifier(). aziz parents: 145 diff changeset	855
8180eb84e69c - Started implementation of parseAttributeSpecifier(). aziz parents: 145 diff changeset	856 switch (token.type)
8180eb84e69c - Started implementation of parseAttributeSpecifier(). aziz parents: 145 diff changeset	857 {
8180eb84e69c - Started implementation of parseAttributeSpecifier(). aziz parents: 145 diff changeset	858 case T.Align:
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	859 uint alignSize = parseAlignAttribute();
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	860 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	861 this.alignSize = alignSize; // Set.
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	862 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	863 this.alignSize = saved; // Restore.
146 8180eb84e69c - Started implementation of parseAttributeSpecifier(). aziz parents: 145 diff changeset	864 break;
8180eb84e69c - Started implementation of parseAttributeSpecifier(). aziz parents: 145 diff changeset	865 case T.Pragma:
147 e46b3415ec16 - Implemented parsing pragma declarations. aziz parents: 146 diff changeset	866 // Pragma:
e46b3415ec16 - Implemented parsing pragma declarations. aziz parents: 146 diff changeset	867 // pragma ( Identifier )
e46b3415ec16 - Implemented parsing pragma declarations. aziz parents: 146 diff changeset	868 // pragma ( Identifier , ExpressionList )
e46b3415ec16 - Implemented parsing pragma declarations. aziz parents: 146 diff changeset	869 nT();
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	870 Identifier* ident;
147 e46b3415ec16 - Implemented parsing pragma declarations. aziz parents: 146 diff changeset	871 Expression[] args;
e46b3415ec16 - Implemented parsing pragma declarations. aziz parents: 146 diff changeset	872
e46b3415ec16 - Implemented parsing pragma declarations. aziz parents: 146 diff changeset	873 require(T.LParen);
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	874 ident = requireIdentifier(MSG.ExpectedPragmaIdentifier);
147 e46b3415ec16 - Implemented parsing pragma declarations. aziz parents: 146 diff changeset	875
e46b3415ec16 - Implemented parsing pragma declarations. aziz parents: 146 diff changeset	876 if (token.type == T.Comma)
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	877 nT(), (args = parseExpressionList());
486 bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	878 require(T.RParen);
147 e46b3415ec16 - Implemented parsing pragma declarations. aziz parents: 146 diff changeset	879
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	880 decl = new PragmaDeclaration(ident, args, parseDeclarationsBlock());
147 e46b3415ec16 - Implemented parsing pragma declarations. aziz parents: 146 diff changeset	881 break;
491 b991f49628a8 Forgot committing Parser.d as well. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 489 diff changeset	882 default:
b991f49628a8 Forgot committing Parser.d as well. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 489 diff changeset	883 // Protection attributes
b991f49628a8 Forgot committing Parser.d as well. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 489 diff changeset	884 Protection prot;
b991f49628a8 Forgot committing Parser.d as well. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 489 diff changeset	885 switch (token.type)
b991f49628a8 Forgot committing Parser.d as well. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 489 diff changeset	886 {
b991f49628a8 Forgot committing Parser.d as well. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 489 diff changeset	887 case T.Private:
b991f49628a8 Forgot committing Parser.d as well. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 489 diff changeset	888 prot = Protection.Private; break;
b991f49628a8 Forgot committing Parser.d as well. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 489 diff changeset	889 case T.Package:
b991f49628a8 Forgot committing Parser.d as well. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 489 diff changeset	890 prot = Protection.Package; break;
b991f49628a8 Forgot committing Parser.d as well. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 489 diff changeset	891 case T.Protected:
b991f49628a8 Forgot committing Parser.d as well. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 489 diff changeset	892 prot = Protection.Protected; break;
b991f49628a8 Forgot committing Parser.d as well. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 489 diff changeset	893 case T.Public:
b991f49628a8 Forgot committing Parser.d as well. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 489 diff changeset	894 prot = Protection.Public; break;
b991f49628a8 Forgot committing Parser.d as well. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 489 diff changeset	895 case T.Export:
b991f49628a8 Forgot committing Parser.d as well. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 489 diff changeset	896 prot = Protection.Export; break;
b991f49628a8 Forgot committing Parser.d as well. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 489 diff changeset	897 default:
b991f49628a8 Forgot committing Parser.d as well. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 489 diff changeset	898 assert(0);
b991f49628a8 Forgot committing Parser.d as well. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 489 diff changeset	899 }
150 753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	900 nT();
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	901 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	902 this.protection = prot; // Set.
491 b991f49628a8 Forgot committing Parser.d as well. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 489 diff changeset	903 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	904 this.protection = saved; // Restore.
146 8180eb84e69c - Started implementation of parseAttributeSpecifier(). aziz parents: 145 diff changeset	905 }
8180eb84e69c - Started implementation of parseAttributeSpecifier(). aziz parents: 145 diff changeset	906 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	907 }
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	908
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 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	910 {
107 722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	911 assert(token.type == T.Import \|\| token.type == T.Static);
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	912
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	913 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	914
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 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	916 {
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	917 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	918 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	919 }
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	920
429 052cbacb1642 Fix: removed infinite loop when parsing static imports. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 424 diff changeset	921 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	922
364 1059295c2727 - Every command module has an execute method now. aziz parents: 359 diff changeset	923 ModuleFQN[] moduleFQNs;
504 9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 502 diff changeset	924 Identifier*[] moduleAliases;
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 502 diff changeset	925 Identifier*[] bindNames;
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 502 diff changeset	926 Identifier*[] bindAliases;
114 83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	927
115 cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier(). aziz parents: 114 diff changeset	928 nT(); // Skip import keyword.
298 dc8bed242db5 - Fixed parsing ImportDeclaration. aziz parents: 297 diff changeset	929 while (1)
114 83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	930 {
364 1059295c2727 - Every command module has an execute method now. aziz parents: 359 diff changeset	931 ModuleFQN moduleFQN;
504 9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 502 diff changeset	932 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	933
cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier(). aziz parents: 114 diff changeset	934 // AliasName = ModuleName
504 9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 502 diff changeset	935 if (peekNext() == T.Assign)
114 83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	936 {
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	937 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	938 nT(); // Skip =
114 83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	939 }
115 cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier(). aziz parents: 114 diff changeset	940
298 dc8bed242db5 - Fixed parsing ImportDeclaration. aziz parents: 297 diff changeset	941 // Identifier(.Identifier)*
504 9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 502 diff changeset	942 while (1)
114 83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	943 {
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	944 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	945 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	946 break;
114 83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	947 nT();
83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	948 }
83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	949
83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	950 // Push identifiers.
364 1059295c2727 - Every command module has an execute method now. aziz parents: 359 diff changeset	951 moduleFQNs ~= moduleFQN;
114 83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	952 moduleAliases ~= moduleAlias;
83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	953
298 dc8bed242db5 - Fixed parsing ImportDeclaration. aziz parents: 297 diff changeset	954 if (token.type != T.Comma)
dc8bed242db5 - Fixed parsing ImportDeclaration. aziz parents: 297 diff changeset	955 break;
dc8bed242db5 - Fixed parsing ImportDeclaration. aziz parents: 297 diff changeset	956 nT();
dc8bed242db5 - Fixed parsing ImportDeclaration. aziz parents: 297 diff changeset	957 }
dc8bed242db5 - Fixed parsing ImportDeclaration. aziz parents: 297 diff changeset	958
dc8bed242db5 - Fixed parsing ImportDeclaration. aziz parents: 297 diff changeset	959 if (token.type == T.Colon)
dc8bed242db5 - Fixed parsing ImportDeclaration. aziz parents: 297 diff changeset	960 {
dc8bed242db5 - Fixed parsing ImportDeclaration. aziz parents: 297 diff changeset	961 // BindAlias = BindName(, BindAlias = BindName)*;
dc8bed242db5 - Fixed parsing ImportDeclaration. aziz parents: 297 diff changeset	962 // BindName(, BindName)*;
320 0ce14640eb04 - Fix in parseImportDeclaration(): rewrote while loop and removed a call to nT(). aziz parents: 319 diff changeset	963 do
114 83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	964 {
298 dc8bed242db5 - Fixed parsing ImportDeclaration. aziz parents: 297 diff changeset	965 nT();
504 9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 502 diff changeset	966 Identifier* bindAlias;
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 502 diff changeset	967 // BindAlias = BindName
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 502 diff changeset	968 if (peekNext() == T.Assign)
114 83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	969 {
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	970 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	971 nT(); // Skip =
298 dc8bed242db5 - Fixed parsing ImportDeclaration. aziz parents: 297 diff changeset	972 }
dc8bed242db5 - Fixed parsing ImportDeclaration. aziz parents: 297 diff changeset	973 // Push identifiers.
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	974 bindNames ~= requireIdentifier(MSG.ExpectedImportName);
298 dc8bed242db5 - Fixed parsing ImportDeclaration. aziz parents: 297 diff changeset	975 bindAliases ~= bindAlias;
320 0ce14640eb04 - Fix in parseImportDeclaration(): rewrote while loop and removed a call to nT(). aziz parents: 319 diff changeset	976 } while (token.type == T.Comma)
298 dc8bed242db5 - Fixed parsing ImportDeclaration. aziz parents: 297 diff changeset	977 }
dc8bed242db5 - Fixed parsing ImportDeclaration. aziz parents: 297 diff changeset	978
114 83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	979 require(T.Semicolon);
83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	980
366 dcbd3bf9bf74 - Added command importgraph/igraph to main.d. aziz parents: 364 diff changeset	981 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	982 }
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	983
107 722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	984 Declaration parseEnumDeclaration()
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	985 {
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	986 assert(token.type == T.Enum);
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	987
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	988 Identifier* enumName;
107 722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	989 Type baseType;
406 e242f0ee2d27 Added class EnumMember. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 405 diff changeset	990 EnumMember[] members;
126 0f0e7352e91d - Renamed member hasDefinition of class Declaration to hasBody. aziz parents: 125 diff changeset	991 bool hasBody;
107 722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	992
115 cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier(). aziz parents: 114 diff changeset	993 nT(); // Skip enum keyword.
231 6846138a0e24 - Fixed parseEnumDeclaration(). aziz parents: 230 diff changeset	994
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	995 enumName = optionalIdentifier();
107 722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	996
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	997 if (token.type == T.Colon)
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	998 {
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	999 nT();
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	1000 baseType = parseBasicType();
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	1001 }
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	1002
115 cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier(). aziz parents: 114 diff changeset	1003 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	1004 {
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	1005 if (enumName is null)
231 6846138a0e24 - Fixed parseEnumDeclaration(). aziz parents: 230 diff changeset	1006 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	1007 nT();
cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier(). aziz parents: 114 diff changeset	1008 }
cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier(). aziz parents: 114 diff changeset	1009 else if (token.type == T.LBrace)
107 722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	1010 {
126 0f0e7352e91d - Renamed member hasDefinition of class Declaration to hasBody. aziz parents: 125 diff changeset	1011 hasBody = true;
398 f7bb892d64c2 Fixed Parser.parseEnumDeclaration(): empty enums are allowed now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 396 diff changeset	1012 nT(); // Skip {
f7bb892d64c2 Fixed Parser.parseEnumDeclaration(): empty enums are allowed now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 396 diff changeset	1013 while (token.type != T.RBrace)
107 722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	1014 {
406 e242f0ee2d27 Added class EnumMember. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 405 diff changeset	1015 auto begin = token;
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	1016 auto name = requireIdentifier(MSG.ExpectedEnumMember);
406 e242f0ee2d27 Added class EnumMember. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 405 diff changeset	1017 Expression value;
107 722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	1018
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	1019 if (token.type == T.Assign)
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	1020 nT(), (value = parseAssignExpression());
107 722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	1021 else
406 e242f0ee2d27 Added class EnumMember. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 405 diff changeset	1022 value = null;
e242f0ee2d27 Added class EnumMember. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 405 diff changeset	1023
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	1024 members ~= set(new EnumMember(name, value), begin);
107 722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	1025
398 f7bb892d64c2 Fixed Parser.parseEnumDeclaration(): empty enums are allowed now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 396 diff changeset	1026 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	1027 break;
398 f7bb892d64c2 Fixed Parser.parseEnumDeclaration(): empty enums are allowed now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 396 diff changeset	1028 nT(); // Skip ,
f7bb892d64c2 Fixed Parser.parseEnumDeclaration(): empty enums are allowed now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 396 diff changeset	1029 }
f7bb892d64c2 Fixed Parser.parseEnumDeclaration(): empty enums are allowed now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 396 diff changeset	1030 require(T.RBrace);
107 722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	1031 }
231 6846138a0e24 - Fixed parseEnumDeclaration(). aziz parents: 230 diff changeset	1032 else
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	1033 error(token, MSG.ExpectedEnumBody, token.srcText);
107 722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	1034
406 e242f0ee2d27 Added class EnumMember. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 405 diff changeset	1035 return new EnumDeclaration(enumName, baseType, members, hasBody);
107 722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	1036 }
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	1037
109 d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1038 Declaration parseClassDeclaration()
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1039 {
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1040 assert(token.type == T.Class);
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1041
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	1042 Identifier* className;
258 112a57f433f2 - Created class TemplateParameters. aziz parents: 257 diff changeset	1043 TemplateParameters tparams;
109 d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1044 BaseClass[] bases;
305 df237b3b5f09 - Added class Declarations. aziz parents: 304 diff changeset	1045 Declarations decls;
109 d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1046
115 cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier(). aziz parents: 114 diff changeset	1047 nT(); // Skip class keyword.
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	1048 className = requireIdentifier(MSG.ExpectedClassName);
109 d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1049
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1050 if (token.type == T.LParen)
195 37c2ffd649c4 - Parsing template parameter list for class, interface, struct and union declarations. aziz parents: 194 diff changeset	1051 tparams = parseTemplateParameterList();
109 d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1052
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1053 if (token.type == T.Colon)
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1054 bases = parseBaseClasses();
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1055
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1056 if (token.type == T.Semicolon)
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1057 {
405 e2529923a0cb Added two error messages. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 404 diff changeset	1058 if (bases.length != 0)
e2529923a0cb Added two error messages. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 404 diff changeset	1059 error(MID.BaseClassInForwardDeclaration);
109 d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1060 nT();
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1061 }
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1062 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	1063 decls = parseDeclarationDefinitionsBody();
109 d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1064 else
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	1065 error(token, MSG.ExpectedClassBody, token.srcText);
109 d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1066
494 9a7ca8c56e59 Refactored a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 493 diff changeset	1067 return new ClassDeclaration(className, tparams, bases, decls);
109 d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1068 }
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1069
144 cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon. aziz parents: 143 diff changeset	1070 BaseClass[] parseBaseClasses(bool colonLeadsOff = true)
109 d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1071 {
144 cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon. aziz parents: 143 diff changeset	1072 if (colonLeadsOff)
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon. aziz parents: 143 diff changeset	1073 {
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon. aziz parents: 143 diff changeset	1074 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	1075 nT(); // Skip colon
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon. aziz parents: 143 diff changeset	1076 }
109 d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1077
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1078 BaseClass[] bases;
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1079
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1080 while (1)
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1081 {
117 79857de26e86 - Moved class Parameter to module Types. Added struct Parameters. aziz parents: 116 diff changeset	1082 Protection prot = Protection.Public;
109 d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1083 switch (token.type)
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1084 {
204 082f30904456 - Allowing 'typeof' in BaseClassList. aziz parents: 203 diff changeset	1085 case T.Identifier, T.Dot, T.Typeof: goto LparseBasicType;
109 d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1086 case T.Private: prot = Protection.Private; break;
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1087 case T.Protected: prot = Protection.Protected; break;
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1088 case T.Package: prot = Protection.Package; break;
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1089 case T.Public: /prot = Protection.Public;/ break;
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1090 default:
405 e2529923a0cb Added two error messages. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 404 diff changeset	1091 error(MID.ExpectedBaseClasses, token.srcText);
109 d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1092 return bases;
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1093 }
158 759f437313f9 - Moved enum Protection and class BaseClass to module Types. aziz parents: 157 diff changeset	1094 nT(); // Skip protection attribute.
759f437313f9 - Moved enum Protection and class BaseClass to module Types. aziz parents: 157 diff changeset	1095 LparseBasicType:
486 bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	1096 auto begin = token;
158 759f437313f9 - Moved enum Protection and class BaseClass to module Types. aziz parents: 157 diff changeset	1097 auto type = parseBasicType();
759f437313f9 - Moved enum Protection and class BaseClass to module Types. aziz parents: 157 diff changeset	1098 //if (type.tid != TID.DotList)
759f437313f9 - Moved enum Protection and class BaseClass to module Types. aziz parents: 157 diff changeset	1099 // 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	1100 bases ~= set(new BaseClass(prot, type), begin);
109 d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1101 if (token.type != T.Comma)
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1102 break;
396 0a4619735ce9 Applied fixes to Lexer, Parser and other classes. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 391 diff changeset	1103 nT();
109 d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1104 }
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1105 return bases;
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1106 }
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1107
112 004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	1108 Declaration parseInterfaceDeclaration()
004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	1109 {
004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	1110 assert(token.type == T.Interface);
004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	1111
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	1112 Identifier* name;
258 112a57f433f2 - Created class TemplateParameters. aziz parents: 257 diff changeset	1113 TemplateParameters tparams;
112 004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	1114 BaseClass[] bases;
305 df237b3b5f09 - Added class Declarations. aziz parents: 304 diff changeset	1115 Declarations decls;
112 004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	1116
115 cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier(). aziz parents: 114 diff changeset	1117 nT(); // Skip interface keyword.
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	1118 name = requireIdentifier(MSG.ExpectedInterfaceName);
112 004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	1119
004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	1120 if (token.type == T.LParen)
195 37c2ffd649c4 - Parsing template parameter list for class, interface, struct and union declarations. aziz parents: 194 diff changeset	1121 tparams = parseTemplateParameterList();
112 004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	1122
004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	1123 if (token.type == T.Colon)
004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	1124 bases = parseBaseClasses();
004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	1125
004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	1126 if (token.type == T.Semicolon)
004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	1127 {
405 e2529923a0cb Added two error messages. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 404 diff changeset	1128 if (bases.length != 0)
e2529923a0cb Added two error messages. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 404 diff changeset	1129 error(MID.BaseClassInForwardDeclaration);
112 004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	1130 nT();
004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	1131 }
004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	1132 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	1133 decls = parseDeclarationDefinitionsBody();
112 004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	1134 else
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	1135 error(token, MSG.ExpectedInterfaceBody, token.srcText);
112 004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	1136
494 9a7ca8c56e59 Refactored a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 493 diff changeset	1137 return new InterfaceDeclaration(name, tparams, bases, decls);
112 004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	1138 }
004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	1139
113 20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	1140 Declaration parseAggregateDeclaration()
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	1141 {
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	1142 assert(token.type == T.Struct \|\| token.type == T.Union);
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	1143
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	1144 TOK tok = token.type;
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	1145
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	1146 Identifier* name;
258 112a57f433f2 - Created class TemplateParameters. aziz parents: 257 diff changeset	1147 TemplateParameters tparams;
305 df237b3b5f09 - Added class Declarations. aziz parents: 304 diff changeset	1148 Declarations decls;
113 20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	1149
115 cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier(). aziz parents: 114 diff changeset	1150 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	1151
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	1152 name = optionalIdentifier();
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	1153
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	1154 if (name && token.type == T.LParen)
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	1155 tparams = parseTemplateParameterList();
113 20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	1156
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	1157 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	1158 {
cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier(). aziz parents: 114 diff changeset	1159 //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	1160 // TODO: error: forward declarations must have a name.
113 20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	1161 nT();
115 cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier(). aziz parents: 114 diff changeset	1162 }
113 20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	1163 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	1164 decls = parseDeclarationDefinitionsBody();
113 20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	1165 else
124 d4c4cea6ee7f - Renamed method errorIfNot() to expected(). aziz parents: 123 diff changeset	1166 expected(T.LBrace); // TODO: better error msg
113 20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	1167
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	1168 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	1169 {
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	1170 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	1171 sd.setAlignSize(this.alignSize);
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	1172 return sd;
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	1173 }
113 20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	1174 else
494 9a7ca8c56e59 Refactored a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 493 diff changeset	1175 return new UnionDeclaration(name, tparams, decls);
113 20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	1176 }
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	1177
117 79857de26e86 - Moved class Parameter to module Types. Added struct Parameters. aziz parents: 116 diff changeset	1178 Declaration parseConstructorDeclaration()
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters. aziz parents: 116 diff changeset	1179 {
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters. aziz parents: 116 diff changeset	1180 assert(token.type == T.This);
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters. aziz parents: 116 diff changeset	1181 nT(); // Skip 'this' keyword.
143 e760d7552f66 - Renamed parseArgumentList() to parseArguments(). aziz parents: 141 diff changeset	1182 auto parameters = parseParameterList();
267 f3dfa6208ed3 - Removed parameter func from parseFunctionBody(). Creating new FunctionBody inside the method. aziz parents: 266 diff changeset	1183 auto funcBody = parseFunctionBody();
197 ff32eb87300e - Using parseFunctionBody() for Constructor-,Destructor-,StaticConstructor-,StaticDestructor-,Invariant-,Unittest-,New- and DeleteDeclaration. aziz parents: 196 diff changeset	1184 return new ConstructorDeclaration(parameters, funcBody);
117 79857de26e86 - Moved class Parameter to module Types. Added struct Parameters. aziz parents: 116 diff changeset	1185 }
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters. aziz parents: 116 diff changeset	1186
118 379f33cbd521 - Added parseDestructorDeclaration() and DestructorDeclaration class. aziz parents: 117 diff changeset	1187 Declaration parseDestructorDeclaration()
379f33cbd521 - Added parseDestructorDeclaration() and DestructorDeclaration class. aziz parents: 117 diff changeset	1188 {
379f33cbd521 - Added parseDestructorDeclaration() and DestructorDeclaration class. aziz parents: 117 diff changeset	1189 assert(token.type == T.Tilde);
379f33cbd521 - Added parseDestructorDeclaration() and DestructorDeclaration class. aziz parents: 117 diff changeset	1190 nT(); // Skip ~
379f33cbd521 - Added parseDestructorDeclaration() and DestructorDeclaration class. aziz parents: 117 diff changeset	1191 require(T.This);
379f33cbd521 - Added parseDestructorDeclaration() and DestructorDeclaration class. aziz parents: 117 diff changeset	1192 require(T.LParen);
379f33cbd521 - Added parseDestructorDeclaration() and DestructorDeclaration class. aziz parents: 117 diff changeset	1193 require(T.RParen);
267 f3dfa6208ed3 - Removed parameter func from parseFunctionBody(). Creating new FunctionBody inside the method. aziz parents: 266 diff changeset	1194 auto funcBody = parseFunctionBody();
197 ff32eb87300e - Using parseFunctionBody() for Constructor-,Destructor-,StaticConstructor-,StaticDestructor-,Invariant-,Unittest-,New- and DeleteDeclaration. aziz parents: 196 diff changeset	1195 return new DestructorDeclaration(funcBody);
118 379f33cbd521 - Added parseDestructorDeclaration() and DestructorDeclaration class. aziz parents: 117 diff changeset	1196 }
379f33cbd521 - Added parseDestructorDeclaration() and DestructorDeclaration class. aziz parents: 117 diff changeset	1197
119 363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	1198 Declaration parseStaticConstructorDeclaration()
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	1199 {
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	1200 assert(token.type == T.Static);
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	1201 nT(); // Skip static keyword.
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	1202 nT(); // Skip 'this' keyword.
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	1203 require(T.LParen);
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	1204 require(T.RParen);
267 f3dfa6208ed3 - Removed parameter func from parseFunctionBody(). Creating new FunctionBody inside the method. aziz parents: 266 diff changeset	1205 auto funcBody = parseFunctionBody();
197 ff32eb87300e - Using parseFunctionBody() for Constructor-,Destructor-,StaticConstructor-,StaticDestructor-,Invariant-,Unittest-,New- and DeleteDeclaration. aziz parents: 196 diff changeset	1206 return new StaticConstructorDeclaration(funcBody);
119 363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	1207 }
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	1208
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	1209 Declaration parseStaticDestructorDeclaration()
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	1210 {
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	1211 assert(token.type == T.Static);
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	1212 nT(); // Skip static keyword.
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	1213 nT(); // Skip ~
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	1214 require(T.This);
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	1215 require(T.LParen);
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	1216 require(T.RParen);
267 f3dfa6208ed3 - Removed parameter func from parseFunctionBody(). Creating new FunctionBody inside the method. aziz parents: 266 diff changeset	1217 auto funcBody = parseFunctionBody();
197 ff32eb87300e - Using parseFunctionBody() for Constructor-,Destructor-,StaticConstructor-,StaticDestructor-,Invariant-,Unittest-,New- and DeleteDeclaration. aziz parents: 196 diff changeset	1218 return new StaticDestructorDeclaration(funcBody);
119 363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	1219 }
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	1220
120 e5329dac0405 - Added parseInvariantDeclaration(). aziz parents: 119 diff changeset	1221 Declaration parseInvariantDeclaration()
e5329dac0405 - Added parseInvariantDeclaration(). aziz parents: 119 diff changeset	1222 {
e5329dac0405 - Added parseInvariantDeclaration(). aziz parents: 119 diff changeset	1223 assert(token.type == T.Invariant);
e5329dac0405 - Added parseInvariantDeclaration(). aziz parents: 119 diff changeset	1224 nT(); // Skip invariant keyword.
e5329dac0405 - Added parseInvariantDeclaration(). aziz parents: 119 diff changeset	1225 // Optional () for getting ready porting to D 2.0
e5329dac0405 - Added parseInvariantDeclaration(). aziz parents: 119 diff changeset	1226 if (token.type == T.LParen)
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	1227 requireNext(T.RParen);
267 f3dfa6208ed3 - Removed parameter func from parseFunctionBody(). Creating new FunctionBody inside the method. aziz parents: 266 diff changeset	1228 auto funcBody = parseFunctionBody();
197 ff32eb87300e - Using parseFunctionBody() for Constructor-,Destructor-,StaticConstructor-,StaticDestructor-,Invariant-,Unittest-,New- and DeleteDeclaration. aziz parents: 196 diff changeset	1229 return new InvariantDeclaration(funcBody);
120 e5329dac0405 - Added parseInvariantDeclaration(). aziz parents: 119 diff changeset	1230 }
e5329dac0405 - Added parseInvariantDeclaration(). aziz parents: 119 diff changeset	1231
121 030933c6b5f0 - Added parseUnittestDeclaration(). aziz parents: 120 diff changeset	1232 Declaration parseUnittestDeclaration()
030933c6b5f0 - Added parseUnittestDeclaration(). aziz parents: 120 diff changeset	1233 {
030933c6b5f0 - Added parseUnittestDeclaration(). aziz parents: 120 diff changeset	1234 assert(token.type == T.Unittest);
030933c6b5f0 - Added parseUnittestDeclaration(). aziz parents: 120 diff changeset	1235
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	1236 nT(); // Skip unittest keyword.
267 f3dfa6208ed3 - Removed parameter func from parseFunctionBody(). Creating new FunctionBody inside the method. aziz parents: 266 diff changeset	1237 auto funcBody = parseFunctionBody();
197 ff32eb87300e - Using parseFunctionBody() for Constructor-,Destructor-,StaticConstructor-,StaticDestructor-,Invariant-,Unittest-,New- and DeleteDeclaration. aziz parents: 196 diff changeset	1238 return new UnittestDeclaration(funcBody);
121 030933c6b5f0 - Added parseUnittestDeclaration(). aziz parents: 120 diff changeset	1239 }
030933c6b5f0 - Added parseUnittestDeclaration(). aziz parents: 120 diff changeset	1240
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	1241 Declaration parseDebugDeclaration()
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	1242 {
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	1243 assert(token.type == T.Debug);
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	1244
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	1245 nT(); // Skip debug keyword.
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	1246
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	1247 Token* spec; // debug = Integer ;
50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	1248 // debug = Identifier ;
50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	1249 Token* cond; // debug ( Integer )
50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	1250 // debug ( Identifier )
305 df237b3b5f09 - Added class Declarations. aziz parents: 304 diff changeset	1251 Declaration decls, elseDecls;
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	1252
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	1253 void parseIdentOrInt(ref Token* tok)
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	1254 {
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	1255 nT();
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	1256 if (token.type == T.Int32 \|\|
50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	1257 token.type == T.Identifier)
50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	1258 {
50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	1259 tok = token;
50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	1260 nT();
50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	1261 }
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	1262 else
124 d4c4cea6ee7f - Renamed method errorIfNot() to expected(). aziz parents: 123 diff changeset	1263 expected(T.Identifier); // TODO: better error msg
123 0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1264 }
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1265
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1266 if (token.type == T.Assign)
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1267 {
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	1268 parseIdentOrInt(spec);
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	1269 require(T.Semicolon);
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	1270 }
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	1271 else
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	1272 {
123 0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1273 // Condition:
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1274 // Integer
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1275 // Identifier
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1276 // ( Condition )
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	1277 if (token.type == T.LParen)
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	1278 {
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	1279 parseIdentOrInt(cond);
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	1280 require(T.RParen);
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	1281 }
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	1282
123 0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1283 // debug DeclarationsBlock
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1284 // debug ( Condition ) DeclarationsBlock
404 fe46b5ea7a18 Added method parseDeclarationsBlockNoColon(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 400 diff changeset	1285 decls = parseDeclarationsBlockNoColon();
123 0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1286
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1287 // else DeclarationsBlock
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	1288 if (token.type == T.Else)
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	1289 {
123 0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1290 nT();
404 fe46b5ea7a18 Added method parseDeclarationsBlockNoColon(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 400 diff changeset	1291 elseDecls = parseDeclarationsBlockNoColon();
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
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	1295 return new DebugDeclaration(spec, cond, decls, elseDecls);
123 0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1296 }
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1297
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1298 Declaration parseVersionDeclaration()
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1299 {
146 8180eb84e69c - Started implementation of parseAttributeSpecifier(). aziz parents: 145 diff changeset	1300 assert(token.type == T.Version);
123 0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1301
146 8180eb84e69c - Started implementation of parseAttributeSpecifier(). aziz parents: 145 diff changeset	1302 nT(); // Skip version keyword.
123 0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1303
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	1304 Token* spec; // version = Integer ;
50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	1305 // version = Identifier ;
50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	1306 Token* cond; // version ( Integer )
50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	1307 // version ( Identifier )
305 df237b3b5f09 - Added class Declarations. aziz parents: 304 diff changeset	1308 Declaration decls, elseDecls;
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	1309
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	1310 void parseIdentOrInt(ref Token* tok)
123 0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1311 {
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	1312 if (token.type == T.Int32 \|\|
50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	1313 token.type == T.Identifier)
50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	1314 {
50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	1315 tok = token;
50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	1316 nT();
50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	1317 }
123 0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1318 else
124 d4c4cea6ee7f - Renamed method errorIfNot() to expected(). aziz parents: 123 diff changeset	1319 expected(T.Identifier); // TODO: better error msg
123 0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1320 }
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1321
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1322 if (token.type == T.Assign)
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1323 {
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	1324 nT();
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	1325 parseIdentOrInt(spec);
123 0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1326 require(T.Semicolon);
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1327 }
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1328 else
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1329 {
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1330 // Condition:
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1331 // Integer
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1332 // Identifier
146 8180eb84e69c - Started implementation of parseAttributeSpecifier(). aziz parents: 145 diff changeset	1333
123 0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1334 // ( Condition )
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1335 require(T.LParen);
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	1336 parseIdentOrInt(cond);
123 0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1337 require(T.RParen);
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1338
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1339 // version ( Condition ) DeclarationsBlock
404 fe46b5ea7a18 Added method parseDeclarationsBlockNoColon(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 400 diff changeset	1340 decls = parseDeclarationsBlockNoColon();
123 0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1341
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1342 // else DeclarationsBlock
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1343 if (token.type == T.Else)
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1344 {
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1345 nT();
404 fe46b5ea7a18 Added method parseDeclarationsBlockNoColon(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 400 diff changeset	1346 elseDecls = parseDeclarationsBlockNoColon();
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	1347 }
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	1348 }
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	1349
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	1350 return new VersionDeclaration(spec, cond, decls, elseDecls);
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	1351 }
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	1352
125 240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	1353 Declaration parseStaticIfDeclaration()
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	1354 {
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	1355 assert(token.type == T.Static);
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	1356
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	1357 nT(); // Skip static keyword.
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	1358 nT(); // Skip if keyword.
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	1359
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	1360 Expression condition;
305 df237b3b5f09 - Added class Declarations. aziz parents: 304 diff changeset	1361 Declaration ifDecls, elseDecls;
125 240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	1362
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	1363 require(T.LParen);
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	1364 condition = parseAssignExpression();
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	1365 require(T.RParen);
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	1366
404 fe46b5ea7a18 Added method parseDeclarationsBlockNoColon(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 400 diff changeset	1367 ifDecls = parseDeclarationsBlockNoColon();
125 240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	1368
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	1369 if (token.type == T.Else)
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 nT();
404 fe46b5ea7a18 Added method parseDeclarationsBlockNoColon(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 400 diff changeset	1372 elseDecls = parseDeclarationsBlockNoColon();
125 240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	1373 }
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	1374
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	1375 return new StaticIfDeclaration(condition, ifDecls, elseDecls);
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	1376 }
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	1377
127 cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration. aziz parents: 126 diff changeset	1378 Declaration parseStaticAssertDeclaration()
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration. aziz parents: 126 diff changeset	1379 {
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration. aziz parents: 126 diff changeset	1380 assert(token.type == T.Static);
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration. aziz parents: 126 diff changeset	1381
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration. aziz parents: 126 diff changeset	1382 nT(); // Skip static keyword.
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration. aziz parents: 126 diff changeset	1383 nT(); // Skip assert keyword.
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 Expression condition, message;
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 require(T.LParen);
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 condition = parseAssignExpression();
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration. aziz parents: 126 diff changeset	1390
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration. aziz parents: 126 diff changeset	1391 if (token.type == T.Comma)
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 nT();
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration. aziz parents: 126 diff changeset	1394 message = parseAssignExpression();
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
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration. aziz parents: 126 diff changeset	1397 require(T.RParen);
128 e02b87281b4e - Static asserts have to end with a semicolon. aziz parents: 127 diff changeset	1398 require(T.Semicolon);
127 cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration. aziz parents: 126 diff changeset	1399
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration. aziz parents: 126 diff changeset	1400 return new StaticAssertDeclaration(condition, message);
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration. aziz parents: 126 diff changeset	1401 }
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration. aziz parents: 126 diff changeset	1402
140 64d7186b087c - Implemented parseTemplateParameters(). aziz parents: 139 diff changeset	1403 Declaration parseTemplateDeclaration()
64d7186b087c - Implemented parseTemplateParameters(). aziz parents: 139 diff changeset	1404 {
64d7186b087c - Implemented parseTemplateParameters(). aziz parents: 139 diff changeset	1405 assert(token.type == T.Template);
64d7186b087c - Implemented parseTemplateParameters(). aziz parents: 139 diff changeset	1406 nT(); // Skip template keyword.
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	1407 auto templateName = requireIdentifier(MSG.ExpectedTemplateName);
143 e760d7552f66 - Renamed parseArgumentList() to parseArguments(). aziz parents: 141 diff changeset	1408 auto templateParams = parseTemplateParameterList();
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	1409 auto decls = parseDeclarationDefinitionsBody();
140 64d7186b087c - Implemented parseTemplateParameters(). aziz parents: 139 diff changeset	1410 return new TemplateDeclaration(templateName, templateParams, decls);
64d7186b087c - Implemented parseTemplateParameters(). aziz parents: 139 diff changeset	1411 }
64d7186b087c - Implemented parseTemplateParameters(). aziz parents: 139 diff changeset	1412
141 7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration(). aziz parents: 140 diff changeset	1413 Declaration parseNewDeclaration()
7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration(). aziz parents: 140 diff changeset	1414 {
7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration(). aziz parents: 140 diff changeset	1415 assert(token.type == T.New);
7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration(). aziz parents: 140 diff changeset	1416 nT(); // Skip new keyword.
143 e760d7552f66 - Renamed parseArgumentList() to parseArguments(). aziz parents: 141 diff changeset	1417 auto parameters = parseParameterList();
267 f3dfa6208ed3 - Removed parameter func from parseFunctionBody(). Creating new FunctionBody inside the method. aziz parents: 266 diff changeset	1418 auto funcBody = parseFunctionBody();
197 ff32eb87300e - Using parseFunctionBody() for Constructor-,Destructor-,StaticConstructor-,StaticDestructor-,Invariant-,Unittest-,New- and DeleteDeclaration. aziz parents: 196 diff changeset	1419 return new NewDeclaration(parameters, funcBody);
141 7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration(). aziz parents: 140 diff changeset	1420 }
7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration(). aziz parents: 140 diff changeset	1421
7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration(). aziz parents: 140 diff changeset	1422 Declaration parseDeleteDeclaration()
7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration(). aziz parents: 140 diff changeset	1423 {
7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration(). aziz parents: 140 diff changeset	1424 assert(token.type == T.Delete);
7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration(). aziz parents: 140 diff changeset	1425 nT(); // Skip delete keyword.
143 e760d7552f66 - Renamed parseArgumentList() to parseArguments(). aziz parents: 141 diff changeset	1426 auto parameters = parseParameterList();
197 ff32eb87300e - Using parseFunctionBody() for Constructor-,Destructor-,StaticConstructor-,StaticDestructor-,Invariant-,Unittest-,New- and DeleteDeclaration. aziz parents: 196 diff changeset	1427 // 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	1428 auto funcBody = parseFunctionBody();
197 ff32eb87300e - Using parseFunctionBody() for Constructor-,Destructor-,StaticConstructor-,StaticDestructor-,Invariant-,Unittest-,New- and DeleteDeclaration. aziz parents: 196 diff changeset	1429 return new DeleteDeclaration(parameters, funcBody);
141 7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration(). aziz parents: 140 diff changeset	1430 }
7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration(). aziz parents: 140 diff changeset	1431
492 9c208925a3d4 Added module ImportParser and new stuff from DMD2.008. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 491 diff changeset	1432 Type parseTypeofType()
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 491 diff changeset	1433 {
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 491 diff changeset	1434 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	1435 Type type;
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 491 diff changeset	1436 requireNext(T.LParen);
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 491 diff changeset	1437 switch (token.type)
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 491 diff changeset	1438 {
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 491 diff changeset	1439 version(D2)
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 491 diff changeset	1440 {
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 491 diff changeset	1441 case T.Return:
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 491 diff changeset	1442 nT();
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();
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 491 diff changeset	1444 break;
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 491 diff changeset	1445 }
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 491 diff changeset	1446 default:
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 491 diff changeset	1447 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	1448 }
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 491 diff changeset	1449 require(T.RParen);
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 491 diff changeset	1450 return type;
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 491 diff changeset	1451 }
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 491 diff changeset	1452
154 0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1453 /+
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1454 DotListExpression:
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 DotListItems
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1457 Typeof
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1458 Typeof . DotListItems
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1459 DotListItems:
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1460 DotListItem
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1461 DotListItem . DotListItems
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1462 DotListItem:
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1463 Identifier
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1464 TemplateInstance
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1465 NewExpression
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1466 TemplateInstance:
233 c2b601dcd57d - Added assert to parseDotListExpression(). aziz parents: 232 diff changeset	1467 Identifier !( TemplateArguments )
154 0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1468 +/
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1469 DotListExpression parseDotListExpression()
152 fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression. aziz parents: 151 diff changeset	1470 {
233 c2b601dcd57d - Added assert to parseDotListExpression(). aziz parents: 232 diff changeset	1471 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	1472 auto begin = token;
152 fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression. aziz parents: 151 diff changeset	1473 Expression[] identList;
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression. aziz parents: 151 diff changeset	1474 if (token.type == T.Dot)
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression. aziz parents: 151 diff changeset	1475 {
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression. aziz parents: 151 diff changeset	1476 nT();
488 cfb3805768b6 Added DotExpression and DotType. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 486 diff changeset	1477 identList ~= set(new DotExpression(), begin);
152 fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression. aziz parents: 151 diff changeset	1478 }
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression. aziz parents: 151 diff changeset	1479 else if (token.type == T.Typeof)
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression. aziz parents: 151 diff changeset	1480 {
492 9c208925a3d4 Added module ImportParser and new stuff from DMD2.008. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 491 diff changeset	1481 auto type = parseTypeofType();
486 bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	1482 set(type, begin);
bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	1483 identList ~= set(new TypeofExpression(type), begin);
152 fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression. aziz parents: 151 diff changeset	1484 if (token.type != T.Dot)
154 0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1485 goto Lreturn;
152 fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression. aziz parents: 151 diff changeset	1486 nT();
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression. aziz parents: 151 diff changeset	1487 }
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression. aziz parents: 151 diff changeset	1488
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression. aziz parents: 151 diff changeset	1489 while (1)
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression. aziz parents: 151 diff changeset	1490 {
486 bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	1491 begin = token;
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	1492 auto ident = requireIdentifier(MSG.ExpectedAnIdentifier);
252 788398655d24 - Changed some string types to Token. Adapted parser accordingly. aziz* parents: 251 diff changeset	1493 Expression e;
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1494 if (token.type == T.Not && peekNext() == T.LParen) // Identifier !( TemplateArguments )
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 nT(); // Skip !.
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	1497 auto tparams = parseTemplateArguments();
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	1498 e = new TemplateInstanceExpression(ident, tparams);
152 fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression. aziz parents: 151 diff changeset	1499 }
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression. aziz parents: 151 diff changeset	1500 else // Identifier
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	1501 e = new IdentifierExpression(ident);
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	1502
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	1503 identList ~= set(e, begin);
152 fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression. aziz parents: 151 diff changeset	1504
154 0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1505 LnewExpressionLoop:
152 fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression. aziz parents: 151 diff changeset	1506 if (token.type != T.Dot)
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression. aziz parents: 151 diff changeset	1507 break;
154 0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1508 nT(); // Skip dot.
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1509
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1510 if (token.type == T.New)
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1511 {
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1512 identList ~= parseNewExpression();
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1513 goto LnewExpressionLoop;
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1514 }
152 fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression. aziz parents: 151 diff changeset	1515 }
233 c2b601dcd57d - Added assert to parseDotListExpression(). aziz parents: 232 diff changeset	1516
154 0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1517 Lreturn:
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1518 return new DotListExpression(identList);
152 fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression. aziz parents: 151 diff changeset	1519 }
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression. aziz parents: 151 diff changeset	1520
154 0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1521 /+
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1522 DotListType:
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 TypeItems
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1525 Typeof
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1526 Typeof . TypeItems
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1527 TypeItems:
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1528 TypeItem
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1529 TypeItem . TypeItems
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1530 TypeItem:
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1531 Identifier
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1532 TemplateInstance
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1533 TemplateInstance:
233 c2b601dcd57d - Added assert to parseDotListExpression(). aziz parents: 232 diff changeset	1534 Identifier !( TemplateArguments )
154 0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1535 +/
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1536 DotListType parseDotListType()
153 66790fc2c0a2 - Added method parseIdentifierListType(). aziz parents: 152 diff changeset	1537 {
484 265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	1538 auto begin = token;
153 66790fc2c0a2 - Added method parseIdentifierListType(). aziz parents: 152 diff changeset	1539 Type[] identList;
66790fc2c0a2 - Added method parseIdentifierListType(). aziz parents: 152 diff changeset	1540 if (token.type == T.Dot)
66790fc2c0a2 - Added method parseIdentifierListType(). aziz parents: 152 diff changeset	1541 {
66790fc2c0a2 - Added method parseIdentifierListType(). aziz parents: 152 diff changeset	1542 nT();
488 cfb3805768b6 Added DotExpression and DotType. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 486 diff changeset	1543 identList ~= set(new DotType(), begin);
153 66790fc2c0a2 - Added method parseIdentifierListType(). aziz parents: 152 diff changeset	1544 }
66790fc2c0a2 - Added method parseIdentifierListType(). aziz parents: 152 diff changeset	1545 else if (token.type == T.Typeof)
66790fc2c0a2 - Added method parseIdentifierListType(). aziz parents: 152 diff changeset	1546 {
492 9c208925a3d4 Added module ImportParser and new stuff from DMD2.008. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 491 diff changeset	1547 identList ~= set(parseTypeofType(), begin);
153 66790fc2c0a2 - Added method parseIdentifierListType(). aziz parents: 152 diff changeset	1548 if (token.type != T.Dot)
154 0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1549 goto Lreturn;
153 66790fc2c0a2 - Added method parseIdentifierListType(). aziz parents: 152 diff changeset	1550 nT();
66790fc2c0a2 - Added method parseIdentifierListType(). aziz parents: 152 diff changeset	1551 }
66790fc2c0a2 - Added method parseIdentifierListType(). aziz parents: 152 diff changeset	1552
66790fc2c0a2 - Added method parseIdentifierListType(). aziz parents: 152 diff changeset	1553 while (1)
66790fc2c0a2 - Added method parseIdentifierListType(). aziz parents: 152 diff changeset	1554 {
484 265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	1555 begin = token;
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	1556 auto ident = requireIdentifier(MSG.ExpectedAnIdentifier);
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	1557 Type t;
154 0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1558 // 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	1559 if (token.type == T.Not/+ && peekNext() == T.LParen+/) // Identifier !( TemplateArguments )
153 66790fc2c0a2 - Added method parseIdentifierListType(). aziz parents: 152 diff changeset	1560 {
66790fc2c0a2 - Added method parseIdentifierListType(). aziz parents: 152 diff changeset	1561 nT(); // Skip !.
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	1562 t = new TemplateInstanceType(ident, parseTemplateArguments());
153 66790fc2c0a2 - Added method parseIdentifierListType(). aziz parents: 152 diff changeset	1563 }
66790fc2c0a2 - Added method parseIdentifierListType(). aziz parents: 152 diff changeset	1564 else // Identifier
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	1565 t = new IdentifierType(ident);
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	1566
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	1567 identList ~= set(t, begin);
153 66790fc2c0a2 - Added method parseIdentifierListType(). aziz parents: 152 diff changeset	1568
66790fc2c0a2 - Added method parseIdentifierListType(). aziz parents: 152 diff changeset	1569 if (token.type != T.Dot)
66790fc2c0a2 - Added method parseIdentifierListType(). aziz parents: 152 diff changeset	1570 break;
66790fc2c0a2 - Added method parseIdentifierListType(). aziz parents: 152 diff changeset	1571 nT();
66790fc2c0a2 - Added method parseIdentifierListType(). aziz parents: 152 diff changeset	1572 }
154 0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1573 Lreturn:
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1574 return new DotListType(identList);
153 66790fc2c0a2 - Added method parseIdentifierListType(). aziz parents: 152 diff changeset	1575 }
66790fc2c0a2 - Added method parseIdentifierListType(). aziz parents: 152 diff changeset	1576
150 753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1577 /*
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1578 TemplateMixin:
151 2e959f67000b - Added code for parsing mixin expression declarations. aziz parents: 150 diff changeset	1579 mixin ( AssignExpression ) ;
150 753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1580 mixin TemplateIdentifier ;
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1581 mixin TemplateIdentifier MixinIdentifier ;
233 c2b601dcd57d - Added assert to parseDotListExpression(). aziz parents: 232 diff changeset	1582 mixin TemplateIdentifier !( TemplateArguments ) ;
c2b601dcd57d - Added assert to parseDotListExpression(). aziz parents: 232 diff changeset	1583 mixin TemplateIdentifier !( TemplateArguments ) MixinIdentifier ;
150 753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1584 */
256 8f27920ae17a - Made parseMixinDeclaration() a template. aziz parents: 255 diff changeset	1585 Class parseMixin(Class)()
150 753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1586 {
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1587 assert(token.type == T.Mixin);
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1588 nT(); // Skip mixin keyword.
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1589
256 8f27920ae17a - Made parseMixinDeclaration() a template. aziz parents: 255 diff changeset	1590 static if (is(Class == MixinDeclaration))
301 caef255a2801 - Fix in some ctors: adding only non-null members to this.children. aziz parents: 299 diff changeset	1591 {
151 2e959f67000b - Added code for parsing mixin expression declarations. aziz parents: 150 diff changeset	1592 if (token.type == T.LParen)
2e959f67000b - Added code for parsing mixin expression declarations. aziz parents: 150 diff changeset	1593 {
2e959f67000b - Added code for parsing mixin expression declarations. aziz parents: 150 diff changeset	1594 // TODO: What about mixin(...).ident;?
2e959f67000b - Added code for parsing mixin expression declarations. aziz parents: 150 diff changeset	1595 nT();
2e959f67000b - Added code for parsing mixin expression declarations. aziz parents: 150 diff changeset	1596 auto e = parseAssignExpression();
2e959f67000b - Added code for parsing mixin expression declarations. aziz parents: 150 diff changeset	1597 require(T.RParen);
2e959f67000b - Added code for parsing mixin expression declarations. aziz parents: 150 diff changeset	1598 require(T.Semicolon);
262 0f22269e76ff - Changed some string types to Token. aziz* parents: 261 diff changeset	1599 return new MixinDeclaration(e);
151 2e959f67000b - Added code for parsing mixin expression declarations. aziz parents: 150 diff changeset	1600 }
301 caef255a2801 - Fix in some ctors: adding only non-null members to this.children. aziz parents: 299 diff changeset	1601 }
151 2e959f67000b - Added code for parsing mixin expression declarations. aziz parents: 150 diff changeset	1602
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	1603 auto begin = token;
150 753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1604 Expression[] templateIdent;
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	1605 Identifier* mixinIdent;
150 753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1606
159 5aa877506db0 - Added enum Linkage. aziz parents: 158 diff changeset	1607 // This code is similar to parseDotListType().
150 753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1608 if (token.type == T.Dot)
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 nT();
488 cfb3805768b6 Added DotExpression and DotType. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 486 diff changeset	1611 templateIdent ~= set(new DotExpression(), begin);
150 753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1612 }
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1613
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1614 while (1)
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1615 {
484 265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	1616 begin = token;
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	1617 auto ident = requireIdentifier(MSG.ExpectedAnIdentifier);
252 788398655d24 - Changed some string types to Token. Adapted parser accordingly. aziz* parents: 251 diff changeset	1618 Expression e;
150 753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1619 if (token.type == T.Not) // Identifier !( TemplateArguments )
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1620 {
151 2e959f67000b - Added code for parsing mixin expression declarations. aziz parents: 150 diff changeset	1621 // 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	1622 nT();
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	1623 auto tparams = parseTemplateArguments();
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	1624 e = new TemplateInstanceExpression(ident, tparams);
150 753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1625 }
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1626 else // Identifier
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	1627 e = new IdentifierExpression(ident);
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	1628
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	1629 templateIdent ~= set(e, begin);
150 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 if (token.type != T.Dot)
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1632 break;
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1633 nT();
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1634 }
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1635
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	1636 mixinIdent = optionalIdentifier();
150 753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1637 require(T.Semicolon);
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1638
262 0f22269e76ff - Changed some string types to Token. aziz* parents: 261 diff changeset	1639 return new Class(templateIdent, mixinIdent);
150 753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1640 }
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1641
102 6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	1642 /+++++++++++++++++++++++++++++
161 82c5cfc7d6d3 - Started implementation of parsing statements. aziz parents: 160 diff changeset	1643 + Statement parsing methods +
82c5cfc7d6d3 - Started implementation of parsing statements. aziz parents: 160 diff changeset	1644 +++++++++++++++++++++++++++++/
82c5cfc7d6d3 - Started implementation of parsing statements. aziz parents: 160 diff changeset	1645
82c5cfc7d6d3 - Started implementation of parsing statements. aziz parents: 160 diff changeset	1646 Statements parseStatements()
82c5cfc7d6d3 - Started implementation of parsing statements. aziz parents: 160 diff changeset	1647 {
262 0f22269e76ff - Changed some string types to Token. aziz* parents: 261 diff changeset	1648 auto begin = token;
318 a1c9d93a66e3 - Added member prevToken to Parser. aziz parents: 314 diff changeset	1649 require(T.LBrace);
162 c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	1650 auto statements = new Statements();
161 82c5cfc7d6d3 - Started implementation of parsing statements. aziz parents: 160 diff changeset	1651 while (token.type != T.RBrace && token.type != T.EOF)
82c5cfc7d6d3 - Started implementation of parsing statements. aziz parents: 160 diff changeset	1652 statements ~= parseStatement();
318 a1c9d93a66e3 - Added member prevToken to Parser. aziz parents: 314 diff changeset	1653 require(T.RBrace);
262 0f22269e76ff - Changed some string types to Token. aziz* parents: 261 diff changeset	1654 return set(statements, begin);
161 82c5cfc7d6d3 - Started implementation of parsing statements. aziz parents: 160 diff changeset	1655 }
82c5cfc7d6d3 - Started implementation of parsing statements. aziz parents: 160 diff changeset	1656
82c5cfc7d6d3 - Started implementation of parsing statements. aziz parents: 160 diff changeset	1657 Statement parseStatement()
82c5cfc7d6d3 - Started implementation of parsing statements. aziz parents: 160 diff changeset	1658 {
261 966756c5d5d3 - Added begin variables and calls to set(). aziz parents: 260 diff changeset	1659 auto begin = token;
161 82c5cfc7d6d3 - Started implementation of parsing statements. aziz parents: 160 diff changeset	1660 Statement s;
188 5c6ebf9f60a9 - Added code for parsing DeclarationStatement. aziz parents: 187 diff changeset	1661 Declaration d;
161 82c5cfc7d6d3 - Started implementation of parsing statements. aziz parents: 160 diff changeset	1662 switch (token.type)
82c5cfc7d6d3 - Started implementation of parsing statements. aziz parents: 160 diff changeset	1663 {
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1664 case T.Align:
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	1665 uint size = parseAlignAttribute();
260 b83180748ae6 - Added method parseAlignAttribute(). aziz parents: 259 diff changeset	1666 // 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	1667 StructDeclaration structDecl;
260 b83180748ae6 - Added method parseAlignAttribute(). aziz parents: 259 diff changeset	1668 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	1669 {
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	1670 auto begin2 = token;
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	1671 structDecl = CastTo!(StructDeclaration)(parseAggregateDeclaration());
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	1672 structDecl.setAlignSize(size);
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	1673 set(structDecl, begin2);
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	1674 }
260 b83180748ae6 - Added method parseAlignAttribute(). aziz parents: 259 diff changeset	1675 else
b83180748ae6 - Added method parseAlignAttribute(). aziz parents: 259 diff changeset	1676 expected(T.Struct);
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	1677
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	1678 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	1679 goto LreturnDeclarationStatement;
201 70715b9e2109 - Implemented parseAttributeStatement(). aziz parents: 200 diff changeset	1680 /+ Not applicable for statements.
191 3ce110cefbc5 - Added code for parsing AliasDeclaration and TypedefDeclaration. aziz parents: 190 diff changeset	1681 // T.Private,
3ce110cefbc5 - Added code for parsing AliasDeclaration and TypedefDeclaration. aziz parents: 190 diff changeset	1682 // T.Package,
3ce110cefbc5 - Added code for parsing AliasDeclaration and TypedefDeclaration. aziz parents: 190 diff changeset	1683 // T.Protected,
3ce110cefbc5 - Added code for parsing AliasDeclaration and TypedefDeclaration. aziz parents: 190 diff changeset	1684 // T.Public,
3ce110cefbc5 - Added code for parsing AliasDeclaration and TypedefDeclaration. aziz parents: 190 diff changeset	1685 // T.Export,
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1686 // T.Deprecated,
191 3ce110cefbc5 - Added code for parsing AliasDeclaration and TypedefDeclaration. aziz parents: 190 diff changeset	1687 // T.Override,
3ce110cefbc5 - Added code for parsing AliasDeclaration and TypedefDeclaration. aziz parents: 190 diff changeset	1688 // T.Abstract,
201 70715b9e2109 - Implemented parseAttributeStatement(). aziz parents: 200 diff changeset	1689 +/
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1690 case T.Extern,
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1691 T.Final,
191 3ce110cefbc5 - Added code for parsing AliasDeclaration and TypedefDeclaration. aziz parents: 190 diff changeset	1692 T.Const,
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1693 T.Auto:
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1694 //T.Scope
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1695 //T.Static
201 70715b9e2109 - Implemented parseAttributeStatement(). aziz parents: 200 diff changeset	1696 case_parseAttribute:
70715b9e2109 - Implemented parseAttributeStatement(). aziz parents: 200 diff changeset	1697 s = parseAttributeStatement();
261 966756c5d5d3 - Added begin variables and calls to set(). aziz parents: 260 diff changeset	1698 return s;
161 82c5cfc7d6d3 - Started implementation of parsing statements. aziz parents: 160 diff changeset	1699 case T.Identifier:
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1700 if (peekNext() == T.Colon)
161 82c5cfc7d6d3 - Started implementation of parsing statements. aziz parents: 160 diff changeset	1701 {
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	1702 auto ident = token.ident;
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	1703 nT(), nT(); // Skip Identifier :
234 5c1111dc8670 - Added method parseNoScopeOrEmptyStatement(). aziz parents: 233 diff changeset	1704 s = new LabeledStatement(ident, parseNoScopeOrEmptyStatement());
161 82c5cfc7d6d3 - Started implementation of parsing statements. aziz parents: 160 diff changeset	1705 break;
82c5cfc7d6d3 - Started implementation of parsing statements. aziz parents: 160 diff changeset	1706 }
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	1707 goto case T.Dot;
201 70715b9e2109 - Implemented parseAttributeStatement(). aziz parents: 200 diff changeset	1708 case T.Dot, T.Typeof:
214 45fc474c1678 - Changed 'failed' parameter of try_() to 'success'. aziz parents: 213 diff changeset	1709 bool success;
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	1710 d = try_(delegate {
501 949a53332c66 Fixed parsing of AutoDeclarations. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 496 diff changeset	1711 return parseVariableOrFunction(StorageClass.None,
949a53332c66 Fixed parsing of AutoDeclarations. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 496 diff changeset	1712 Protection.None,
949a53332c66 Fixed parsing of AutoDeclarations. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 496 diff changeset	1713 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	1714 }, success
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	1715 );
214 45fc474c1678 - Changed 'failed' parameter of try_() to 'success'. aziz parents: 213 diff changeset	1716 if (success)
483 180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	1717 goto LreturnDeclarationStatement; // Declaration
201 70715b9e2109 - Implemented parseAttributeStatement(). aziz parents: 200 diff changeset	1718 else
483 180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	1719 goto case_parseExpressionStatement; // Expression
180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	1720 // IntegralType
496 5a607597dc22 Improved error recovery in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 495 diff changeset	1721 case T.Char, T.Wchar, T.Dchar, T.Bool,
5a607597dc22 Improved error recovery in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 495 diff changeset	1722 T.Byte, T.Ubyte, T.Short, T.Ushort,
5a607597dc22 Improved error recovery in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 495 diff changeset	1723 T.Int, T.Uint, T.Long, T.Ulong,
201 70715b9e2109 - Implemented parseAttributeStatement(). aziz parents: 200 diff changeset	1724 T.Float, T.Double, T.Real,
70715b9e2109 - Implemented parseAttributeStatement(). aziz parents: 200 diff changeset	1725 T.Ifloat, T.Idouble, T.Ireal,
70715b9e2109 - Implemented parseAttributeStatement(). aziz parents: 200 diff changeset	1726 T.Cfloat, T.Cdouble, T.Creal, T.Void:
70715b9e2109 - Implemented parseAttributeStatement(). aziz parents: 200 diff changeset	1727 case_parseDeclaration:
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	1728 d = parseVariableOrFunction();
483 180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	1729 goto LreturnDeclarationStatement;
162 c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	1730 case T.If:
c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	1731 s = parseIfStatement();
c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	1732 break;
164 8ec99326752b - Implemented parseWhileStatement(). aziz parents: 163 diff changeset	1733 case T.While:
8ec99326752b - Implemented parseWhileStatement(). aziz parents: 163 diff changeset	1734 s = parseWhileStatement();
8ec99326752b - Implemented parseWhileStatement(). aziz parents: 163 diff changeset	1735 break;
165 797074d143d7 - Implemented parseDoWhileStatement(). aziz parents: 164 diff changeset	1736 case T.Do:
797074d143d7 - Implemented parseDoWhileStatement(). aziz parents: 164 diff changeset	1737 s = parseDoWhileStatement();
797074d143d7 - Implemented parseDoWhileStatement(). aziz parents: 164 diff changeset	1738 break;
216 984d48932bce - Added class EmptyStatement. aziz parents: 214 diff changeset	1739 case T.For:
984d48932bce - Added class EmptyStatement. aziz parents: 214 diff changeset	1740 s = parseForStatement();
984d48932bce - Added class EmptyStatement. aziz parents: 214 diff changeset	1741 break;
169 4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	1742 case T.Foreach, T.Foreach_reverse:
4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	1743 s = parseForeachStatement();
4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	1744 break;
170 a63696d1c474 - Implemented parseSwitchStatement(). aziz parents: 169 diff changeset	1745 case T.Switch:
a63696d1c474 - Implemented parseSwitchStatement(). aziz parents: 169 diff changeset	1746 s = parseSwitchStatement();
a63696d1c474 - Implemented parseSwitchStatement(). aziz parents: 169 diff changeset	1747 break;
171 f1fa9bbdb4cb - Implemented parseCaseStatement(). aziz parents: 170 diff changeset	1748 case T.Case:
f1fa9bbdb4cb - Implemented parseCaseStatement(). aziz parents: 170 diff changeset	1749 s = parseCaseStatement();
f1fa9bbdb4cb - Implemented parseCaseStatement(). aziz parents: 170 diff changeset	1750 break;
172 89d4519bd8a1 - Implemented parseDefaultStatement(). aziz parents: 171 diff changeset	1751 case T.Default:
89d4519bd8a1 - Implemented parseDefaultStatement(). aziz parents: 171 diff changeset	1752 s = parseDefaultStatement();
89d4519bd8a1 - Implemented parseDefaultStatement(). aziz parents: 171 diff changeset	1753 break;
173 c2714ba44350 - Implemented parseContinueStatement(). aziz parents: 172 diff changeset	1754 case T.Continue:
c2714ba44350 - Implemented parseContinueStatement(). aziz parents: 172 diff changeset	1755 s = parseContinueStatement();
c2714ba44350 - Implemented parseContinueStatement(). aziz parents: 172 diff changeset	1756 break;
174 e51c9ee66ea0 - Implemented parseBreakStatement(). aziz parents: 173 diff changeset	1757 case T.Break:
e51c9ee66ea0 - Implemented parseBreakStatement(). aziz parents: 173 diff changeset	1758 s = parseBreakStatement();
e51c9ee66ea0 - Implemented parseBreakStatement(). aziz parents: 173 diff changeset	1759 break;
175 522df6f0f230 - Implemented parseReturnStatement(). aziz parents: 174 diff changeset	1760 case T.Return:
522df6f0f230 - Implemented parseReturnStatement(). aziz parents: 174 diff changeset	1761 s = parseReturnStatement();
522df6f0f230 - Implemented parseReturnStatement(). aziz parents: 174 diff changeset	1762 break;
176 3071522c0cf0 - Implemented parseGotoStatement(). aziz parents: 175 diff changeset	1763 case T.Goto:
3071522c0cf0 - Implemented parseGotoStatement(). aziz parents: 175 diff changeset	1764 s = parseGotoStatement();
3071522c0cf0 - Implemented parseGotoStatement(). aziz parents: 175 diff changeset	1765 break;
177 504b1b2f7c93 - Implemented parseWithStatement(). aziz parents: 176 diff changeset	1766 case T.With:
504b1b2f7c93 - Implemented parseWithStatement(). aziz parents: 176 diff changeset	1767 s = parseWithStatement();
504b1b2f7c93 - Implemented parseWithStatement(). aziz parents: 176 diff changeset	1768 break;
178 62718b29679e - Implemented parseSynchronizedStatement(). aziz parents: 177 diff changeset	1769 case T.Synchronized:
62718b29679e - Implemented parseSynchronizedStatement(). aziz parents: 177 diff changeset	1770 s = parseSynchronizedStatement();
62718b29679e - Implemented parseSynchronizedStatement(). aziz parents: 177 diff changeset	1771 break;
179 507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	1772 case T.Try:
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	1773 s = parseTryStatement();
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	1774 break;
180 d5a67aa578a8 - Implemented parseThrowStatement(). aziz parents: 179 diff changeset	1775 case T.Throw:
d5a67aa578a8 - Implemented parseThrowStatement(). aziz parents: 179 diff changeset	1776 s = parseThrowStatement();
d5a67aa578a8 - Implemented parseThrowStatement(). aziz parents: 179 diff changeset	1777 break;
181 abfd51142477 - Implemented parseScopeGuardStatement(). aziz parents: 180 diff changeset	1778 case T.Scope:
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1779 if (peekNext() != T.LParen)
201 70715b9e2109 - Implemented parseAttributeStatement(). aziz parents: 200 diff changeset	1780 goto case_parseAttribute;
181 abfd51142477 - Implemented parseScopeGuardStatement(). aziz parents: 180 diff changeset	1781 s = parseScopeGuardStatement();
abfd51142477 - Implemented parseScopeGuardStatement(). aziz parents: 180 diff changeset	1782 break;
182 673b355ba0e9 - Implemented parseVolatileStatement(). aziz parents: 181 diff changeset	1783 case T.Volatile:
673b355ba0e9 - Implemented parseVolatileStatement(). aziz parents: 181 diff changeset	1784 s = parseVolatileStatement();
673b355ba0e9 - Implemented parseVolatileStatement(). aziz parents: 181 diff changeset	1785 break;
183 c9df82f6f6be - Added parseAsmStatement() stub. aziz parents: 182 diff changeset	1786 case T.Asm:
c9df82f6f6be - Added parseAsmStatement() stub. aziz parents: 182 diff changeset	1787 s = parseAsmStatement();
c9df82f6f6be - Added parseAsmStatement() stub. aziz parents: 182 diff changeset	1788 break;
184 30a4c8522b09 - Implemented parsePragmaStatement(). aziz parents: 183 diff changeset	1789 case T.Pragma:
30a4c8522b09 - Implemented parsePragmaStatement(). aziz parents: 183 diff changeset	1790 s = parsePragmaStatement();
30a4c8522b09 - Implemented parsePragmaStatement(). aziz parents: 183 diff changeset	1791 break;
185 35c93b776be0 - Added code for parsing MixinStatements. aziz parents: 184 diff changeset	1792 case T.Mixin:
246 52f4aa097865 - Fix: parse mixin as expression instead of statement when next token is T.LParen. aziz parents: 245 diff changeset	1793 if (peekNext() == T.LParen)
483 180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	1794 goto case_parseExpressionStatement; // Parse as expression.
256 8f27920ae17a - Made parseMixinDeclaration() a template. aziz parents: 255 diff changeset	1795 s = parseMixin!(MixinStatement)();
185 35c93b776be0 - Added code for parsing MixinStatements. aziz parents: 184 diff changeset	1796 break;
186 d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	1797 case T.Static:
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1798 switch (peekNext())
186 d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	1799 {
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	1800 case T.If:
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	1801 s = parseStaticIfStatement();
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	1802 break;
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	1803 case T.Assert:
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	1804 s = parseStaticAssertStatement();
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	1805 break;
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	1806 default:
201 70715b9e2109 - Implemented parseAttributeStatement(). aziz parents: 200 diff changeset	1807 goto case_parseAttribute;
186 d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	1808 }
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1809 break;
190 d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	1810 case T.Debug:
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	1811 s = parseDebugStatement();
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	1812 break;
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	1813 case T.Version:
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	1814 s = parseVersionStatement();
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	1815 break;
226 aa38e1401217 - Fixed cases T.Alias and T.Typedef. Wrong function called. aziz parents: 225 diff changeset	1816 // DeclDef
aa38e1401217 - Fixed cases T.Alias and T.Typedef. Wrong function called. aziz parents: 225 diff changeset	1817 case T.Alias, T.Typedef:
aa38e1401217 - Fixed cases T.Alias and T.Typedef. Wrong function called. aziz parents: 225 diff changeset	1818 d = parseDeclarationDefinition();
483 180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	1819 goto LreturnDeclarationStatement;
188 5c6ebf9f60a9 - Added code for parsing DeclarationStatement. aziz parents: 187 diff changeset	1820 case T.Enum:
5c6ebf9f60a9 - Added code for parsing DeclarationStatement. aziz parents: 187 diff changeset	1821 d = parseEnumDeclaration();
483 180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	1822 goto LreturnDeclarationStatement;
188 5c6ebf9f60a9 - Added code for parsing DeclarationStatement. aziz parents: 187 diff changeset	1823 case T.Class:
5c6ebf9f60a9 - Added code for parsing DeclarationStatement. aziz parents: 187 diff changeset	1824 d = parseClassDeclaration();
483 180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	1825 goto LreturnDeclarationStatement;
188 5c6ebf9f60a9 - Added code for parsing DeclarationStatement. aziz parents: 187 diff changeset	1826 case T.Interface:
5c6ebf9f60a9 - Added code for parsing DeclarationStatement. aziz parents: 187 diff changeset	1827 d = parseInterfaceDeclaration();
483 180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	1828 goto LreturnDeclarationStatement;
188 5c6ebf9f60a9 - Added code for parsing DeclarationStatement. aziz parents: 187 diff changeset	1829 case T.Struct, T.Union:
5c6ebf9f60a9 - Added code for parsing DeclarationStatement. aziz parents: 187 diff changeset	1830 d = parseAggregateDeclaration();
483 180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	1831 // goto LreturnDeclarationStatement;
180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	1832 LreturnDeclarationStatement:
261 966756c5d5d3 - Added begin variables and calls to set(). aziz parents: 260 diff changeset	1833 set(d, begin);
188 5c6ebf9f60a9 - Added code for parsing DeclarationStatement. aziz parents: 187 diff changeset	1834 s = new DeclarationStatement(d);
5c6ebf9f60a9 - Added code for parsing DeclarationStatement. aziz parents: 187 diff changeset	1835 break;
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	1836 case T.LBrace:
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	1837 s = parseScopeStatement();
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	1838 break;
216 984d48932bce - Added class EmptyStatement. aziz parents: 214 diff changeset	1839 case T.Semicolon:
231 6846138a0e24 - Fixed parseEnumDeclaration(). aziz parents: 230 diff changeset	1840 nT();
216 984d48932bce - Added class EmptyStatement. aziz parents: 214 diff changeset	1841 s = new EmptyStatement();
984d48932bce - Added class EmptyStatement. aziz parents: 214 diff changeset	1842 break;
400 a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1843 /+
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1844 Parse ExpressionStatement:
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1845 +/
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1846 // 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	1847 // 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	1848 case T.This:
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1849 case T.Super:
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1850 case T.Null:
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1851 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	1852 // case T.Dollar:
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1853 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	1854 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	1855 T.Imaginary32, T.Imaginary64, T.Imaginary80:
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1856 case T.CharLiteral, T.WCharLiteral, T.DCharLiteral:
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1857 case T.String:
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1858 case T.LBracket:
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1859 // case T.LBrace:
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1860 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	1861 case T.Assert:
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1862 // case T.Mixin:
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1863 case T.Import:
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1864 case T.Typeid:
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1865 case T.Is:
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1866 case T.LParen:
496 5a607597dc22 Improved error recovery in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 495 diff changeset	1867 /+ // IntegralType
5a607597dc22 Improved error recovery in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 495 diff changeset	1868 case T.Char, T.Wchar, T.Dchar, T.Bool,
5a607597dc22 Improved error recovery in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 495 diff changeset	1869 T.Byte, T.Ubyte, T.Short, T.Ushort,
5a607597dc22 Improved error recovery in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 495 diff changeset	1870 T.Int, T.Uint, T.Long, T.Ulong,
400 a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1871 T.Float, T.Double, T.Real,
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1872 T.Ifloat, T.Idouble, T.Ireal,
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1873 T.Cfloat, T.Cdouble, T.Creal, T.Void:+/
486 bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	1874 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	1875 // Tokens that can start a UnaryExpression:
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1876 case T.AndBinary,
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1877 T.PlusPlus,
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1878 T.MinusMinus,
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1879 T.Mul,
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1880 T.Minus,
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1881 T.Plus,
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1882 T.Not,
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1883 T.Tilde,
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1884 T.New,
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1885 T.Delete,
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1886 T.Cast:
483 180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	1887 case_parseExpressionStatement:
400 a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1888 s = new ExpressionStatement(parseExpression());
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1889 require(T.Semicolon);
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1890 break;
161 82c5cfc7d6d3 - Started implementation of parsing statements. aziz parents: 160 diff changeset	1891 default:
400 a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1892 if (token.isSpecialToken)
483 180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	1893 goto case_parseExpressionStatement;
400 a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1894
486 bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	1895 if (token.type != T.Dollar)
bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	1896 // 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	1897 assert(delegate bool(){
486 bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	1898 bool success;
bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	1899 auto expression = try_(&parseExpression, success);
bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	1900 return success;
bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	1901 }() == 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	1902 );
400 a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1903
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1904 // 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	1905 s = new IllegalStatement();
5a607597dc22 Improved error recovery in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 495 diff changeset	1906 // Skip to next valid token.
5a607597dc22 Improved error recovery in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 495 diff changeset	1907 do
5a607597dc22 Improved error recovery in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 495 diff changeset	1908 nT();
5a607597dc22 Improved error recovery in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 495 diff changeset	1909 while (!token.isStatementStart &&
5a607597dc22 Improved error recovery in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 495 diff changeset	1910 token.type != T.RBrace &&
5a607597dc22 Improved error recovery in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 495 diff changeset	1911 token.type != T.EOF)
5a607597dc22 Improved error recovery in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 495 diff changeset	1912 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	1913 error(begin, MSG.IllegalStatement ~ text);
161 82c5cfc7d6d3 - Started implementation of parsing statements. aziz parents: 160 diff changeset	1914 }
205 e5a4f88982d1 - Added assert at the end of parseStatement(). aziz parents: 204 diff changeset	1915 assert(s !is null);
261 966756c5d5d3 - Added begin variables and calls to set(). aziz parents: 260 diff changeset	1916 set(s, begin);
161 82c5cfc7d6d3 - Started implementation of parsing statements. aziz parents: 160 diff changeset	1917 return s;
82c5cfc7d6d3 - Started implementation of parsing statements. aziz parents: 160 diff changeset	1918 }
82c5cfc7d6d3 - Started implementation of parsing statements. aziz parents: 160 diff changeset	1919
486 bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	1920 /++
162 c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	1921 ScopeStatement:
219 0d14a09227a4 - Simplified parseScopeStatement(). aziz parents: 218 diff changeset	1922 NoScopeStatement
162 c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	1923 +/
164 8ec99326752b - Implemented parseWhileStatement(). aziz parents: 163 diff changeset	1924 Statement parseScopeStatement()
162 c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	1925 {
219 0d14a09227a4 - Simplified parseScopeStatement(). aziz parents: 218 diff changeset	1926 return new ScopeStatement(parseNoScopeStatement());
162 c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	1927 }
c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	1928
486 bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	1929 /++
166 56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1930 NoScopeStatement:
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1931 NonEmptyStatement
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1932 BlockStatement
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1933 BlockStatement:
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1934 { }
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1935 { StatementList }
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1936 +/
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1937 Statement parseNoScopeStatement()
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1938 {
486 bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	1939 auto begin = token;
166 56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1940 Statement s;
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1941 if (token.type == T.LBrace)
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1942 {
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1943 nT();
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1944 auto ss = new Statements();
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1945 while (token.type != T.RBrace && token.type != T.EOF)
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1946 ss ~= parseStatement();
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1947 require(T.RBrace);
486 bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	1948 s = set(ss, begin);
166 56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1949 }
219 0d14a09227a4 - Simplified parseScopeStatement(). aziz parents: 218 diff changeset	1950 else if (token.type == T.Semicolon)
0d14a09227a4 - Simplified parseScopeStatement(). aziz parents: 218 diff changeset	1951 {
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	1952 error(token, MSG.ExpectedNonEmptyStatement);
219 0d14a09227a4 - Simplified parseScopeStatement(). aziz parents: 218 diff changeset	1953 nT();
486 bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	1954 s = set(new EmptyStatement(), begin);
219 0d14a09227a4 - Simplified parseScopeStatement(). aziz parents: 218 diff changeset	1955 }
166 56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1956 else
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1957 s = parseStatement();
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1958 return s;
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1959 }
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1960
486 bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	1961 /++
234 5c1111dc8670 - Added method parseNoScopeOrEmptyStatement(). aziz parents: 233 diff changeset	1962 NoScopeOrEmptyStatement:
5c1111dc8670 - Added method parseNoScopeOrEmptyStatement(). aziz parents: 233 diff changeset	1963 ;
5c1111dc8670 - Added method parseNoScopeOrEmptyStatement(). aziz parents: 233 diff changeset	1964 NoScopeStatement
5c1111dc8670 - Added method parseNoScopeOrEmptyStatement(). aziz parents: 233 diff changeset	1965 +/
5c1111dc8670 - Added method parseNoScopeOrEmptyStatement(). aziz parents: 233 diff changeset	1966 Statement parseNoScopeOrEmptyStatement()
5c1111dc8670 - Added method parseNoScopeOrEmptyStatement(). aziz parents: 233 diff changeset	1967 {
5c1111dc8670 - Added method parseNoScopeOrEmptyStatement(). aziz parents: 233 diff changeset	1968 if (token.type == T.Semicolon)
312 fa0b6f32c1ae - Added Special to enum TOK. aziz parents: 305 diff changeset	1969 {
486 bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	1970 auto begin = token;
234 5c1111dc8670 - Added method parseNoScopeOrEmptyStatement(). aziz parents: 233 diff changeset	1971 nT();
486 bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	1972 return set(new EmptyStatement(), begin);
312 fa0b6f32c1ae - Added Special to enum TOK. aziz parents: 305 diff changeset	1973 }
234 5c1111dc8670 - Added method parseNoScopeOrEmptyStatement(). aziz parents: 233 diff changeset	1974 else
5c1111dc8670 - Added method parseNoScopeOrEmptyStatement(). aziz parents: 233 diff changeset	1975 return parseNoScopeStatement();
5c1111dc8670 - Added method parseNoScopeOrEmptyStatement(). aziz parents: 233 diff changeset	1976 }
5c1111dc8670 - Added method parseNoScopeOrEmptyStatement(). aziz parents: 233 diff changeset	1977
201 70715b9e2109 - Implemented parseAttributeStatement(). aziz parents: 200 diff changeset	1978 Statement parseAttributeStatement()
70715b9e2109 - Implemented parseAttributeStatement(). aziz parents: 200 diff changeset	1979 {
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	1980 StorageClass stc, stc_tmp;
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	1981 LinkageType prev_linkageType;
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	1982
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	1983 // Nested function.
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	1984 Declaration parse()
201 70715b9e2109 - Implemented parseAttributeStatement(). aziz parents: 200 diff changeset	1985 {
261 966756c5d5d3 - Added begin variables and calls to set(). aziz parents: 260 diff changeset	1986 auto begin = token;
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	1987 Declaration d;
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1988 switch (token.type)
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1989 {
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1990 case T.Extern:
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	1991 if (peekNext() != T.LParen)
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1992 {
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.Extern;
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	1994 goto Lcommon;
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1995 }
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	1996
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	1997 nT();
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	1998 auto linkageType = parseLinkageType();
496 5a607597dc22 Improved error recovery in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 495 diff changeset	1999 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	2000
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	2001 d = new LinkageDeclaration(linkageType, parse());
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	2002 break;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	2003 case T.Static:
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	2004 stc_tmp = StorageClass.Static;
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	2005 goto Lcommon;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	2006 case T.Final:
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	2007 stc_tmp = StorageClass.Final;
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	2008 goto Lcommon;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	2009 case T.Const:
270 764eccdf619d - Fix in parseAttributeStatement(): added checks for T.LParen after const/invariant. aziz parents: 269 diff changeset	2010 version(D2)
764eccdf619d - Fix in parseAttributeStatement(): added checks for T.LParen after const/invariant. aziz parents: 269 diff changeset	2011 {
764eccdf619d - Fix in parseAttributeStatement(): added checks for T.LParen after const/invariant. aziz parents: 269 diff changeset	2012 if (peekNext() == T.LParen)
764eccdf619d - Fix in parseAttributeStatement(): added checks for T.LParen after const/invariant. aziz parents: 269 diff changeset	2013 goto case_Declaration;
764eccdf619d - Fix in parseAttributeStatement(): added checks for T.LParen after const/invariant. aziz parents: 269 diff changeset	2014 }
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	2015 stc_tmp = StorageClass.Const;
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	2016 goto Lcommon;
270 764eccdf619d - Fix in parseAttributeStatement(): added checks for T.LParen after const/invariant. aziz parents: 269 diff changeset	2017 version(D2)
764eccdf619d - Fix in parseAttributeStatement(): added checks for T.LParen after const/invariant. aziz parents: 269 diff changeset	2018 {
764eccdf619d - Fix in parseAttributeStatement(): added checks for T.LParen after const/invariant. aziz parents: 269 diff changeset	2019 case T.Invariant: // D 2.0
764eccdf619d - Fix in parseAttributeStatement(): added checks for T.LParen after const/invariant. aziz parents: 269 diff changeset	2020 if (peekNext() == T.LParen)
764eccdf619d - Fix in parseAttributeStatement(): added checks for T.LParen after const/invariant. aziz parents: 269 diff changeset	2021 goto case_Declaration;
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	2022 stc_tmp = StorageClass.Invariant;
270 764eccdf619d - Fix in parseAttributeStatement(): added checks for T.LParen after const/invariant. aziz parents: 269 diff changeset	2023 goto Lcommon;
764eccdf619d - Fix in parseAttributeStatement(): added checks for T.LParen after const/invariant. aziz parents: 269 diff changeset	2024 }
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	2025 case T.Auto:
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	2026 stc_tmp = StorageClass.Auto;
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	2027 goto Lcommon;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	2028 case T.Scope:
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	2029 stc_tmp = StorageClass.Scope;
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	2030 goto Lcommon;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	2031 Lcommon:
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	2032 // Issue error if redundant.
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	2033 if (stc & stc_tmp)
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	2034 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	2035 else
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	2036 stc \|= stc_tmp;
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	2037
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	2038 auto tok = token.type;
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	2039 nT();
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	2040 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	2041 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	2042 // 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	2043 //case T.Class:
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	2044 default:
270 764eccdf619d - Fix in parseAttributeStatement(): added checks for T.LParen after const/invariant. aziz parents: 269 diff changeset	2045 case_Declaration:
501 949a53332c66 Fixed parsing of AutoDeclarations. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 496 diff changeset	2046 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	2047 }
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	2048 return set(d, begin);
201 70715b9e2109 - Implemented parseAttributeStatement(). aziz parents: 200 diff changeset	2049 }
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	2050 return new DeclarationStatement(parse());
201 70715b9e2109 - Implemented parseAttributeStatement(). aziz parents: 200 diff changeset	2051 }
70715b9e2109 - Implemented parseAttributeStatement(). aziz parents: 200 diff changeset	2052
162 c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	2053 Statement parseIfStatement()
c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	2054 {
c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	2055 assert(token.type == T.If);
c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	2056 nT();
c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	2057
283 df657dd98ffa - Fix: added member type to VariableDeclaration. aziz parents: 282 diff changeset	2058 Statement variable;
162 c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	2059 Expression condition;
c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	2060 Statement ifBody, elseBody;
c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	2061
c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	2062 require(T.LParen);
283 df657dd98ffa - Fix: added member type to VariableDeclaration. aziz parents: 282 diff changeset	2063
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	2064 Identifier* ident;
484 265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	2065 auto begin = token; // For start of AutoDeclaration or normal Declaration.
162 c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	2066 // auto Identifier = Expression
c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	2067 if (token.type == T.Auto)
c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	2068 {
c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	2069 nT();
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	2070 ident = requireIdentifier(MSG.ExpectedVariableName);
162 c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	2071 require(T.Assign);
283 df657dd98ffa - Fix: added member type to VariableDeclaration. aziz parents: 282 diff changeset	2072 auto init = parseExpression();
484 265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	2073 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	2074 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	2075 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	2076 set(d, begin);
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	2077 variable = new DeclarationStatement(d);
484 265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	2078 set(variable, begin);
162 c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	2079 }
c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	2080 else
c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	2081 {
c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	2082 // Declarator = Expression
237 805796880adb - Fix in parseIfStatement(): require(T.Assign) must be encompassed by a try_() call. aziz parents: 236 diff changeset	2083 Type parseDeclaratorAssign()
162 c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	2084 {
237 805796880adb - Fix in parseIfStatement(): require(T.Assign) must be encompassed by a try_() call. aziz parents: 236 diff changeset	2085 auto type = parseDeclarator(ident);
162 c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	2086 require(T.Assign);
237 805796880adb - Fix in parseIfStatement(): require(T.Assign) must be encompassed by a try_() call. aziz parents: 236 diff changeset	2087 return type;
162 c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	2088 }
237 805796880adb - Fix in parseIfStatement(): require(T.Assign) must be encompassed by a try_() call. aziz parents: 236 diff changeset	2089 bool success;
423 6057113f9a44 Refactored Parser.try_(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 422 diff changeset	2090 auto type = try_(&parseDeclaratorAssign, success);
283 df657dd98ffa - Fix: added member type to VariableDeclaration. aziz parents: 282 diff changeset	2091 if (success)
163 f27a98bb17c7 - Fix: when parsing Declarator fails, type and ident is set to null. aziz parents: 162 diff changeset	2092 {
283 df657dd98ffa - Fix: added member type to VariableDeclaration. aziz parents: 282 diff changeset	2093 auto init = parseExpression();
484 265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	2094 auto v = new VariableDeclaration(type, [ident], [init]);
265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	2095 set(v, begin);
265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	2096 variable = new DeclarationStatement(v);
265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	2097 set(variable, begin);
163 f27a98bb17c7 - Fix: when parsing Declarator fails, type and ident is set to null. aziz parents: 162 diff changeset	2098 }
283 df657dd98ffa - Fix: added member type to VariableDeclaration. aziz parents: 282 diff changeset	2099 else
df657dd98ffa - Fix: added member type to VariableDeclaration. aziz parents: 282 diff changeset	2100 condition = parseExpression();
162 c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	2101 }
c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	2102 require(T.RParen);
164 8ec99326752b - Implemented parseWhileStatement(). aziz parents: 163 diff changeset	2103 ifBody = parseScopeStatement();
162 c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	2104 if (token.type == T.Else)
c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	2105 {
c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	2106 nT();
164 8ec99326752b - Implemented parseWhileStatement(). aziz parents: 163 diff changeset	2107 elseBody = parseScopeStatement();
162 c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	2108 }
283 df657dd98ffa - Fix: added member type to VariableDeclaration. aziz parents: 282 diff changeset	2109 return new IfStatement(variable, condition, ifBody, elseBody);
162 c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	2110 }
c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	2111
164 8ec99326752b - Implemented parseWhileStatement(). aziz parents: 163 diff changeset	2112 Statement parseWhileStatement()
8ec99326752b - Implemented parseWhileStatement(). aziz parents: 163 diff changeset	2113 {
8ec99326752b - Implemented parseWhileStatement(). aziz parents: 163 diff changeset	2114 assert(token.type == T.While);
8ec99326752b - Implemented parseWhileStatement(). aziz parents: 163 diff changeset	2115 nT();
166 56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	2116 require(T.LParen);
164 8ec99326752b - Implemented parseWhileStatement(). aziz parents: 163 diff changeset	2117 auto condition = parseExpression();
166 56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	2118 require(T.RParen);
164 8ec99326752b - Implemented parseWhileStatement(). aziz parents: 163 diff changeset	2119 return new WhileStatement(condition, parseScopeStatement());
8ec99326752b - Implemented parseWhileStatement(). aziz parents: 163 diff changeset	2120 }
8ec99326752b - Implemented parseWhileStatement(). aziz parents: 163 diff changeset	2121
165 797074d143d7 - Implemented parseDoWhileStatement(). aziz parents: 164 diff changeset	2122 Statement parseDoWhileStatement()
797074d143d7 - Implemented parseDoWhileStatement(). aziz parents: 164 diff changeset	2123 {
797074d143d7 - Implemented parseDoWhileStatement(). aziz parents: 164 diff changeset	2124 assert(token.type == T.Do);
797074d143d7 - Implemented parseDoWhileStatement(). aziz parents: 164 diff changeset	2125 nT();
797074d143d7 - Implemented parseDoWhileStatement(). aziz parents: 164 diff changeset	2126 auto doBody = parseScopeStatement();
797074d143d7 - Implemented parseDoWhileStatement(). aziz parents: 164 diff changeset	2127 require(T.While);
166 56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	2128 require(T.LParen);
165 797074d143d7 - Implemented parseDoWhileStatement(). aziz parents: 164 diff changeset	2129 auto condition = parseExpression();
166 56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	2130 require(T.RParen);
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	2131 return new DoWhileStatement(condition, doBody);
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	2132 }
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	2133
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	2134 Statement parseForStatement()
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	2135 {
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	2136 assert(token.type == T.For);
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	2137 nT();
165 797074d143d7 - Implemented parseDoWhileStatement(). aziz parents: 164 diff changeset	2138 require(T.LParen);
166 56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	2139
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	2140 Statement init, forBody;
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	2141 Expression condition, increment;
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	2142
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	2143 if (token.type != T.Semicolon)
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	2144 init = parseNoScopeStatement();
230 8f1790d16753 - Fix: added missing call to parseDeclaratorSuffx() in parseDeclaration. aziz parents: 229 diff changeset	2145 else
8f1790d16753 - Fix: added missing call to parseDeclaratorSuffx() in parseDeclaration. aziz parents: 229 diff changeset	2146 nT(); // Skip ;
166 56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	2147 if (token.type != T.Semicolon)
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	2148 condition = parseExpression();
168 fbbb2434bf6b - Simplified parseForStatement(). aziz parents: 167 diff changeset	2149 require(T.Semicolon);
166 56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	2150 if (token.type != T.RParen)
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	2151 increment = parseExpression();
168 fbbb2434bf6b - Simplified parseForStatement(). aziz parents: 167 diff changeset	2152 require(T.RParen);
167 141b908e32b6 - Fix: forgot parsing forBody. aziz parents: 166 diff changeset	2153 forBody = parseScopeStatement();
166 56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	2154 return new ForStatement(init, condition, increment, forBody);
165 797074d143d7 - Implemented parseDoWhileStatement(). aziz parents: 164 diff changeset	2155 }
797074d143d7 - Implemented parseDoWhileStatement(). aziz parents: 164 diff changeset	2156
169 4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	2157 Statement parseForeachStatement()
4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	2158 {
4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	2159 assert(token.type == T.Foreach \|\| token.type == T.Foreach_reverse);
4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	2160 TOK tok = token.type;
4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	2161 nT();
4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	2162
257 6c58366ba1eb - Fix: need to allocate Parameters. aziz parents: 256 diff changeset	2163 auto params = new Parameters;
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	2164 Expression e; // Aggregate or LwrExpression
169 4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	2165
4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	2166 require(T.LParen);
4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	2167 while (1)
4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	2168 {
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	2169 auto paramBegin = token;
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	2170 StorageClass stc;
169 4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	2171 Type type;
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	2172 Identifier* ident;
169 4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	2173
4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	2174 switch (token.type)
4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	2175 {
236 e961d1b957c3 - Fix in parseForeachStatement(): added T.Inout to case T.Ref; removed break statement. aziz parents: 235 diff changeset	2176 case T.Ref, T.Inout:
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	2177 stc = StorageClass.Ref;
169 4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	2178 nT();
236 e961d1b957c3 - Fix in parseForeachStatement(): added T.Inout to case T.Ref; removed break statement. aziz parents: 235 diff changeset	2179 // fall through
169 4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	2180 case T.Identifier:
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	2181 auto next = peekNext();
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	2182 if (next == T.Comma \|\| next == T.Semicolon \|\| next == T.RParen)
169 4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	2183 {
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	2184 ident = requireIdentifier(MSG.ExpectedVariableName);
169 4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	2185 nT();
4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	2186 break;
4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	2187 }
4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	2188 // fall through
4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	2189 default:
4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	2190 type = parseDeclarator(ident);
4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	2191 }
4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	2192
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	2193 params ~= set(new Parameter(stc, type, ident, null), paramBegin);
169 4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	2194
4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	2195 if (token.type != T.Comma)
4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	2196 break;
4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	2197 nT();
4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	2198 }
4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	2199 require(T.Semicolon);
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	2200 e = parseExpression();
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	2201 version(D2)
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	2202 { //Foreach (ForeachType; LwrExpression .. UprExpression ) ScopeStatement
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	2203 if (token.type == T.Slice)
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	2204 {
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	2205 // if (params.length != 1)
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	2206 // error(MID.XYZ); // TODO: issue error msg
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	2207 nT();
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	2208 auto upper = parseExpression();
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	2209 require(T.RParen);
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	2210 auto forBody = parseScopeStatement();
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	2211 return new ForeachRangeStatement(tok, params, e, upper, forBody);
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	2212 }
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	2213 }
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	2214 // Foreach (ForeachTypeList; Aggregate) ScopeStatement
169 4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	2215 require(T.RParen);
4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	2216 auto forBody = parseScopeStatement();
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	2217 return new ForeachStatement(tok, params, e, forBody);
169 4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	2218 }
4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	2219
170 a63696d1c474 - Implemented parseSwitchStatement(). aziz parents: 169 diff changeset	2220 Statement parseSwitchStatement()
a63696d1c474 - Implemented parseSwitchStatement(). aziz parents: 169 diff changeset	2221 {
a63696d1c474 - Implemented parseSwitchStatement(). aziz parents: 169 diff changeset	2222 assert(token.type == T.Switch);
a63696d1c474 - Implemented parseSwitchStatement(). aziz parents: 169 diff changeset	2223 nT();
a63696d1c474 - Implemented parseSwitchStatement(). aziz parents: 169 diff changeset	2224
a63696d1c474 - Implemented parseSwitchStatement(). aziz parents: 169 diff changeset	2225 require(T.LParen);
a63696d1c474 - Implemented parseSwitchStatement(). aziz parents: 169 diff changeset	2226 auto condition = parseExpression();
a63696d1c474 - Implemented parseSwitchStatement(). aziz parents: 169 diff changeset	2227 require(T.RParen);
a63696d1c474 - Implemented parseSwitchStatement(). aziz parents: 169 diff changeset	2228 auto switchBody = parseScopeStatement();
a63696d1c474 - Implemented parseSwitchStatement(). aziz parents: 169 diff changeset	2229 return new SwitchStatement(condition, switchBody);
a63696d1c474 - Implemented parseSwitchStatement(). aziz parents: 169 diff changeset	2230 }
a63696d1c474 - Implemented parseSwitchStatement(). aziz parents: 169 diff changeset	2231
486 bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	2232 /++
bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	2233 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	2234 a default or case statement.
bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	2235 +/
bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	2236 Statement parseCaseOrDefaultBody()
220 0c647e319b8e - Removed assert from parseStatement(). aziz parents: 219 diff changeset	2237 {
0c647e319b8e - Removed assert from parseStatement(). aziz parents: 219 diff changeset	2238 // 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	2239 auto begin = token;
224 f838a37a25bd - Fixed parseCaseDefaultBody(). aziz parents: 223 diff changeset	2240 auto s = new Statements();
f838a37a25bd - Fixed parseCaseDefaultBody(). aziz parents: 223 diff changeset	2241 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	2242 token.type != T.Default &&
bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	2243 token.type != T.RBrace &&
bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	2244 token.type != T.EOF)
224 f838a37a25bd - Fixed parseCaseDefaultBody(). aziz parents: 223 diff changeset	2245 s ~= parseStatement();
486 bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	2246 return set(new ScopeStatement(s), begin);
220 0c647e319b8e - Removed assert from parseStatement(). aziz parents: 219 diff changeset	2247 }
0c647e319b8e - Removed assert from parseStatement(). aziz parents: 219 diff changeset	2248
171 f1fa9bbdb4cb - Implemented parseCaseStatement(). aziz parents: 170 diff changeset	2249 Statement parseCaseStatement()
f1fa9bbdb4cb - Implemented parseCaseStatement(). aziz parents: 170 diff changeset	2250 {
f1fa9bbdb4cb - Implemented parseCaseStatement(). aziz parents: 170 diff changeset	2251 assert(token.type == T.Case);
489 a7291d3ee9d7 Refactored classes that inherit from Node. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 488 diff changeset	2252 nT();
a7291d3ee9d7 Refactored classes that inherit from Node. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 488 diff changeset	2253 auto values = parseExpressionList();
171 f1fa9bbdb4cb - Implemented parseCaseStatement(). aziz parents: 170 diff changeset	2254 require(T.Colon);
486 bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	2255 auto caseBody = parseCaseOrDefaultBody();
171 f1fa9bbdb4cb - Implemented parseCaseStatement(). aziz parents: 170 diff changeset	2256 return new CaseStatement(values, caseBody);
f1fa9bbdb4cb - Implemented parseCaseStatement(). aziz parents: 170 diff changeset	2257 }
f1fa9bbdb4cb - Implemented parseCaseStatement(). aziz parents: 170 diff changeset	2258
172 89d4519bd8a1 - Implemented parseDefaultStatement(). aziz parents: 171 diff changeset	2259 Statement parseDefaultStatement()
89d4519bd8a1 - Implemented parseDefaultStatement(). aziz parents: 171 diff changeset	2260 {
89d4519bd8a1 - Implemented parseDefaultStatement(). aziz parents: 171 diff changeset	2261 assert(token.type == T.Default);
89d4519bd8a1 - Implemented parseDefaultStatement(). aziz parents: 171 diff changeset	2262 nT();
89d4519bd8a1 - Implemented parseDefaultStatement(). aziz parents: 171 diff changeset	2263 require(T.Colon);
486 bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	2264 auto defaultBody = parseCaseOrDefaultBody();
bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	2265 return new DefaultStatement(defaultBody);
172 89d4519bd8a1 - Implemented parseDefaultStatement(). aziz parents: 171 diff changeset	2266 }
89d4519bd8a1 - Implemented parseDefaultStatement(). aziz parents: 171 diff changeset	2267
173 c2714ba44350 - Implemented parseContinueStatement(). aziz parents: 172 diff changeset	2268 Statement parseContinueStatement()
c2714ba44350 - Implemented parseContinueStatement(). aziz parents: 172 diff changeset	2269 {
c2714ba44350 - Implemented parseContinueStatement(). aziz parents: 172 diff changeset	2270 assert(token.type == T.Continue);
c2714ba44350 - Implemented parseContinueStatement(). aziz parents: 172 diff changeset	2271 nT();
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	2272 auto ident = optionalIdentifier();
173 c2714ba44350 - Implemented parseContinueStatement(). aziz parents: 172 diff changeset	2273 require(T.Semicolon);
c2714ba44350 - Implemented parseContinueStatement(). aziz parents: 172 diff changeset	2274 return new ContinueStatement(ident);
c2714ba44350 - Implemented parseContinueStatement(). aziz parents: 172 diff changeset	2275 }
c2714ba44350 - Implemented parseContinueStatement(). aziz parents: 172 diff changeset	2276
174 e51c9ee66ea0 - Implemented parseBreakStatement(). aziz parents: 173 diff changeset	2277 Statement parseBreakStatement()
e51c9ee66ea0 - Implemented parseBreakStatement(). aziz parents: 173 diff changeset	2278 {
e51c9ee66ea0 - Implemented parseBreakStatement(). aziz parents: 173 diff changeset	2279 assert(token.type == T.Break);
e51c9ee66ea0 - Implemented parseBreakStatement(). aziz parents: 173 diff changeset	2280 nT();
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	2281 auto ident = optionalIdentifier();
174 e51c9ee66ea0 - Implemented parseBreakStatement(). aziz parents: 173 diff changeset	2282 return new BreakStatement(ident);
e51c9ee66ea0 - Implemented parseBreakStatement(). aziz parents: 173 diff changeset	2283 }
e51c9ee66ea0 - Implemented parseBreakStatement(). aziz parents: 173 diff changeset	2284
175 522df6f0f230 - Implemented parseReturnStatement(). aziz parents: 174 diff changeset	2285 Statement parseReturnStatement()
522df6f0f230 - Implemented parseReturnStatement(). aziz parents: 174 diff changeset	2286 {
522df6f0f230 - Implemented parseReturnStatement(). aziz parents: 174 diff changeset	2287 assert(token.type == T.Return);
522df6f0f230 - Implemented parseReturnStatement(). aziz parents: 174 diff changeset	2288 nT();
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	2289 Expression expr;
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	2290 if (token.type != T.Semicolon)
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	2291 expr = parseExpression();
175 522df6f0f230 - Implemented parseReturnStatement(). aziz parents: 174 diff changeset	2292 require(T.Semicolon);
522df6f0f230 - Implemented parseReturnStatement(). aziz parents: 174 diff changeset	2293 return new ReturnStatement(expr);
522df6f0f230 - Implemented parseReturnStatement(). aziz parents: 174 diff changeset	2294 }
522df6f0f230 - Implemented parseReturnStatement(). aziz parents: 174 diff changeset	2295
176 3071522c0cf0 - Implemented parseGotoStatement(). aziz parents: 175 diff changeset	2296 Statement parseGotoStatement()
3071522c0cf0 - Implemented parseGotoStatement(). aziz parents: 175 diff changeset	2297 {
3071522c0cf0 - Implemented parseGotoStatement(). aziz parents: 175 diff changeset	2298 assert(token.type == T.Goto);
3071522c0cf0 - Implemented parseGotoStatement(). aziz parents: 175 diff changeset	2299 nT();
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	2300 Identifier* ident;
176 3071522c0cf0 - Implemented parseGotoStatement(). aziz parents: 175 diff changeset	2301 Expression caseExpr;
3071522c0cf0 - Implemented parseGotoStatement(). aziz parents: 175 diff changeset	2302 switch (token.type)
3071522c0cf0 - Implemented parseGotoStatement(). aziz parents: 175 diff changeset	2303 {
3071522c0cf0 - Implemented parseGotoStatement(). aziz parents: 175 diff changeset	2304 case T.Case:
3071522c0cf0 - Implemented parseGotoStatement(). aziz parents: 175 diff changeset	2305 nT();
3071522c0cf0 - Implemented parseGotoStatement(). aziz parents: 175 diff changeset	2306 if (token.type == T.Semicolon)
3071522c0cf0 - Implemented parseGotoStatement(). aziz parents: 175 diff changeset	2307 break;
3071522c0cf0 - Implemented parseGotoStatement(). aziz parents: 175 diff changeset	2308 caseExpr = parseExpression();
3071522c0cf0 - Implemented parseGotoStatement(). aziz parents: 175 diff changeset	2309 break;
3071522c0cf0 - Implemented parseGotoStatement(). aziz parents: 175 diff changeset	2310 case T.Default:
3071522c0cf0 - Implemented parseGotoStatement(). aziz parents: 175 diff changeset	2311 nT();
3071522c0cf0 - Implemented parseGotoStatement(). aziz parents: 175 diff changeset	2312 break;
3071522c0cf0 - Implemented parseGotoStatement(). aziz parents: 175 diff changeset	2313 default:
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	2314 ident = requireIdentifier(MSG.ExpectedAnIdentifier);
176 3071522c0cf0 - Implemented parseGotoStatement(). aziz parents: 175 diff changeset	2315 }
3071522c0cf0 - Implemented parseGotoStatement(). aziz parents: 175 diff changeset	2316 require(T.Semicolon);
3071522c0cf0 - Implemented parseGotoStatement(). aziz parents: 175 diff changeset	2317 return new GotoStatement(ident, caseExpr);
3071522c0cf0 - Implemented parseGotoStatement(). aziz parents: 175 diff changeset	2318 }
3071522c0cf0 - Implemented parseGotoStatement(). aziz parents: 175 diff changeset	2319
177 504b1b2f7c93 - Implemented parseWithStatement(). aziz parents: 176 diff changeset	2320 Statement parseWithStatement()
504b1b2f7c93 - Implemented parseWithStatement(). aziz parents: 176 diff changeset	2321 {
504b1b2f7c93 - Implemented parseWithStatement(). aziz parents: 176 diff changeset	2322 assert(token.type == T.With);
504b1b2f7c93 - Implemented parseWithStatement(). aziz parents: 176 diff changeset	2323 nT();
504b1b2f7c93 - Implemented parseWithStatement(). aziz parents: 176 diff changeset	2324 require(T.LParen);
504b1b2f7c93 - Implemented parseWithStatement(). aziz parents: 176 diff changeset	2325 auto expr = parseExpression();
504b1b2f7c93 - Implemented parseWithStatement(). aziz parents: 176 diff changeset	2326 require(T.RParen);
504b1b2f7c93 - Implemented parseWithStatement(). aziz parents: 176 diff changeset	2327 return new WithStatement(expr, parseScopeStatement());
504b1b2f7c93 - Implemented parseWithStatement(). aziz parents: 176 diff changeset	2328 }
504b1b2f7c93 - Implemented parseWithStatement(). aziz parents: 176 diff changeset	2329
178 62718b29679e - Implemented parseSynchronizedStatement(). aziz parents: 177 diff changeset	2330 Statement parseSynchronizedStatement()
62718b29679e - Implemented parseSynchronizedStatement(). aziz parents: 177 diff changeset	2331 {
62718b29679e - Implemented parseSynchronizedStatement(). aziz parents: 177 diff changeset	2332 assert(token.type == T.Synchronized);
62718b29679e - Implemented parseSynchronizedStatement(). aziz parents: 177 diff changeset	2333 nT();
62718b29679e - Implemented parseSynchronizedStatement(). aziz parents: 177 diff changeset	2334 Expression expr;
62718b29679e - Implemented parseSynchronizedStatement(). aziz parents: 177 diff changeset	2335
62718b29679e - Implemented parseSynchronizedStatement(). aziz parents: 177 diff changeset	2336 if (token.type == T.LParen)
62718b29679e - Implemented parseSynchronizedStatement(). aziz parents: 177 diff changeset	2337 {
62718b29679e - Implemented parseSynchronizedStatement(). aziz parents: 177 diff changeset	2338 nT();
62718b29679e - Implemented parseSynchronizedStatement(). aziz parents: 177 diff changeset	2339 expr = parseExpression();
62718b29679e - Implemented parseSynchronizedStatement(). aziz parents: 177 diff changeset	2340 require(T.RParen);
62718b29679e - Implemented parseSynchronizedStatement(). aziz parents: 177 diff changeset	2341 }
62718b29679e - Implemented parseSynchronizedStatement(). aziz parents: 177 diff changeset	2342 return new SynchronizedStatement(expr, parseScopeStatement());
62718b29679e - Implemented parseSynchronizedStatement(). aziz parents: 177 diff changeset	2343 }
62718b29679e - Implemented parseSynchronizedStatement(). aziz parents: 177 diff changeset	2344
179 507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2345 Statement parseTryStatement()
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2346 {
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2347 assert(token.type == T.Try);
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2348 nT();
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2349
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2350 auto tryBody = parseScopeStatement();
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2351 CatchBody[] catchBodies;
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2352 FinallyBody finBody;
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2353
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2354 while (token.type == T.Catch)
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2355 {
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2356 nT();
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2357 Parameter param;
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2358 if (token.type == T.LParen)
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2359 {
229 a88967db063b - Fix: skip T.LParen in parseTryStatement(). aziz parents: 228 diff changeset	2360 nT();
486 bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	2361 auto begin = token;
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	2362 Identifier* ident;
369 27767e203d64 - Added override attribute to ImportParser.start(). aziz parents: 368 diff changeset	2363 auto type = parseDeclarator(ident, true);
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	2364 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	2365 set(param, begin);
179 507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2366 require(T.RParen);
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2367 }
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2368 catchBodies ~= new CatchBody(param, parseNoScopeStatement());
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2369 if (param is null)
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2370 break; // This is a LastCatch
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2371 }
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2372
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2373 if (token.type == T.Finally)
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2374 {
486 bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	2375 auto begin = token;
179 507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2376 nT();
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2377 finBody = new FinallyBody(parseNoScopeStatement());
486 bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	2378 set(finBody, begin);
179 507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2379 }
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2380
396 0a4619735ce9 Applied fixes to Lexer, Parser and other classes. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 391 diff changeset	2381 if (catchBodies.length == 0 && finBody is null)
179 507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2382 {
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2383 // TODO: issue error msg.
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2384 }
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2385
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2386 return new TryStatement(tryBody, catchBodies, finBody);
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2387 }
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2388
180 d5a67aa578a8 - Implemented parseThrowStatement(). aziz parents: 179 diff changeset	2389 Statement parseThrowStatement()
d5a67aa578a8 - Implemented parseThrowStatement(). aziz parents: 179 diff changeset	2390 {
d5a67aa578a8 - Implemented parseThrowStatement(). aziz parents: 179 diff changeset	2391 assert(token.type == T.Throw);
d5a67aa578a8 - Implemented parseThrowStatement(). aziz parents: 179 diff changeset	2392 nT();
d5a67aa578a8 - Implemented parseThrowStatement(). aziz parents: 179 diff changeset	2393 auto expr = parseExpression();
d5a67aa578a8 - Implemented parseThrowStatement(). aziz parents: 179 diff changeset	2394 require(T.Semicolon);
d5a67aa578a8 - Implemented parseThrowStatement(). aziz parents: 179 diff changeset	2395 return new ThrowStatement(expr);
d5a67aa578a8 - Implemented parseThrowStatement(). aziz parents: 179 diff changeset	2396 }
d5a67aa578a8 - Implemented parseThrowStatement(). aziz parents: 179 diff changeset	2397
181 abfd51142477 - Implemented parseScopeGuardStatement(). aziz parents: 180 diff changeset	2398 Statement parseScopeGuardStatement()
abfd51142477 - Implemented parseScopeGuardStatement(). aziz parents: 180 diff changeset	2399 {
abfd51142477 - Implemented parseScopeGuardStatement(). aziz parents: 180 diff changeset	2400 assert(token.type == T.Scope);
abfd51142477 - Implemented parseScopeGuardStatement(). aziz parents: 180 diff changeset	2401 nT();
abfd51142477 - Implemented parseScopeGuardStatement(). aziz parents: 180 diff changeset	2402 assert(token.type == T.LParen);
abfd51142477 - Implemented parseScopeGuardStatement(). aziz parents: 180 diff changeset	2403 nT();
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	2404 auto condition = requireIdentifier(MSG.ExpectedScopeIdentifier);
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	2405 if (condition)
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	2406 switch (condition.identID)
181 abfd51142477 - Implemented parseScopeGuardStatement(). aziz parents: 180 diff changeset	2407 {
502 4e14cd1b24da Refactored code and added modules related to tabulated Identifiers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 501 diff changeset	2408 case ID.exit, ID.success, ID.failure:
181 abfd51142477 - Implemented parseScopeGuardStatement(). aziz parents: 180 diff changeset	2409 break;
abfd51142477 - Implemented parseScopeGuardStatement(). aziz parents: 180 diff changeset	2410 default:
502 4e14cd1b24da Refactored code and added modules related to tabulated Identifiers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 501 diff changeset	2411 // TODO: create MID.InvalidScopeIdentifier
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	2412 error(this.prevToken, MSG.InvalidScopeIdentifier, this.prevToken.srcText);
181 abfd51142477 - Implemented parseScopeGuardStatement(). aziz parents: 180 diff changeset	2413 }
abfd51142477 - Implemented parseScopeGuardStatement(). aziz parents: 180 diff changeset	2414 require(T.RParen);
abfd51142477 - Implemented parseScopeGuardStatement(). aziz parents: 180 diff changeset	2415 Statement scopeBody;
abfd51142477 - Implemented parseScopeGuardStatement(). aziz parents: 180 diff changeset	2416 if (token.type == T.LBrace)
abfd51142477 - Implemented parseScopeGuardStatement(). aziz parents: 180 diff changeset	2417 scopeBody = parseScopeStatement();
abfd51142477 - Implemented parseScopeGuardStatement(). aziz parents: 180 diff changeset	2418 else
abfd51142477 - Implemented parseScopeGuardStatement(). aziz parents: 180 diff changeset	2419 scopeBody = parseNoScopeStatement();
abfd51142477 - Implemented parseScopeGuardStatement(). aziz parents: 180 diff changeset	2420 return new ScopeGuardStatement(condition, scopeBody);
abfd51142477 - Implemented parseScopeGuardStatement(). aziz parents: 180 diff changeset	2421 }
abfd51142477 - Implemented parseScopeGuardStatement(). aziz parents: 180 diff changeset	2422
182 673b355ba0e9 - Implemented parseVolatileStatement(). aziz parents: 181 diff changeset	2423 Statement parseVolatileStatement()
673b355ba0e9 - Implemented parseVolatileStatement(). aziz parents: 181 diff changeset	2424 {
673b355ba0e9 - Implemented parseVolatileStatement(). aziz parents: 181 diff changeset	2425 assert(token.type == T.Volatile);
673b355ba0e9 - Implemented parseVolatileStatement(). aziz parents: 181 diff changeset	2426 nT();
673b355ba0e9 - Implemented parseVolatileStatement(). aziz parents: 181 diff changeset	2427 Statement volatileBody;
673b355ba0e9 - Implemented parseVolatileStatement(). aziz parents: 181 diff changeset	2428 if (token.type == T.Semicolon)
673b355ba0e9 - Implemented parseVolatileStatement(). aziz parents: 181 diff changeset	2429 nT();
673b355ba0e9 - Implemented parseVolatileStatement(). aziz parents: 181 diff changeset	2430 else if (token.type == T.LBrace)
673b355ba0e9 - Implemented parseVolatileStatement(). aziz parents: 181 diff changeset	2431 volatileBody = parseScopeStatement();
673b355ba0e9 - Implemented parseVolatileStatement(). aziz parents: 181 diff changeset	2432 else
219 0d14a09227a4 - Simplified parseScopeStatement(). aziz parents: 218 diff changeset	2433 volatileBody = parseStatement();
182 673b355ba0e9 - Implemented parseVolatileStatement(). aziz parents: 181 diff changeset	2434 return new VolatileStatement(volatileBody);
673b355ba0e9 - Implemented parseVolatileStatement(). aziz parents: 181 diff changeset	2435 }
673b355ba0e9 - Implemented parseVolatileStatement(). aziz parents: 181 diff changeset	2436
184 30a4c8522b09 - Implemented parsePragmaStatement(). aziz parents: 183 diff changeset	2437 Statement parsePragmaStatement()
30a4c8522b09 - Implemented parsePragmaStatement(). aziz parents: 183 diff changeset	2438 {
30a4c8522b09 - Implemented parsePragmaStatement(). aziz parents: 183 diff changeset	2439 assert(token.type == T.Pragma);
30a4c8522b09 - Implemented parsePragmaStatement(). aziz parents: 183 diff changeset	2440 nT();
30a4c8522b09 - Implemented parsePragmaStatement(). aziz parents: 183 diff changeset	2441
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	2442 Identifier* ident;
184 30a4c8522b09 - Implemented parsePragmaStatement(). aziz parents: 183 diff changeset	2443 Expression[] args;
30a4c8522b09 - Implemented parsePragmaStatement(). aziz parents: 183 diff changeset	2444 Statement pragmaBody;
30a4c8522b09 - Implemented parsePragmaStatement(). aziz parents: 183 diff changeset	2445
30a4c8522b09 - Implemented parsePragmaStatement(). aziz parents: 183 diff changeset	2446 require(T.LParen);
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	2447 ident = requireIdentifier(MSG.ExpectedPragmaIdentifier);
184 30a4c8522b09 - Implemented parsePragmaStatement(). aziz parents: 183 diff changeset	2448
30a4c8522b09 - Implemented parsePragmaStatement(). aziz parents: 183 diff changeset	2449 if (token.type == T.Comma)
244 829fdb2e2915 - Fix: parsing at least one argument in pragma declarations/statements. aziz parents: 243 diff changeset	2450 {
829fdb2e2915 - Fix: parsing at least one argument in pragma declarations/statements. aziz parents: 243 diff changeset	2451 nT();
486 bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	2452 args = parseExpressionList();
244 829fdb2e2915 - Fix: parsing at least one argument in pragma declarations/statements. aziz parents: 243 diff changeset	2453 }
486 bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	2454 require(T.RParen);
184 30a4c8522b09 - Implemented parsePragmaStatement(). aziz parents: 183 diff changeset	2455
234 5c1111dc8670 - Added method parseNoScopeOrEmptyStatement(). aziz parents: 233 diff changeset	2456 pragmaBody = parseNoScopeOrEmptyStatement();
184 30a4c8522b09 - Implemented parsePragmaStatement(). aziz parents: 183 diff changeset	2457
30a4c8522b09 - Implemented parsePragmaStatement(). aziz parents: 183 diff changeset	2458 return new PragmaStatement(ident, args, pragmaBody);
30a4c8522b09 - Implemented parsePragmaStatement(). aziz parents: 183 diff changeset	2459 }
30a4c8522b09 - Implemented parsePragmaStatement(). aziz parents: 183 diff changeset	2460
186 d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2461 Statement parseStaticIfStatement()
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2462 {
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2463 assert(token.type == T.Static);
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2464 nT();
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2465 assert(token.type == T.If);
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2466 nT();
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2467 Expression condition;
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2468 Statement ifBody, elseBody;
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2469
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2470 require(T.LParen);
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2471 condition = parseExpression();
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2472 require(T.RParen);
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2473 ifBody = parseNoScopeStatement();
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2474 if (token.type == T.Else)
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2475 {
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2476 nT();
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2477 elseBody = parseNoScopeStatement();
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2478 }
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2479 return new StaticIfStatement(condition, ifBody, elseBody);
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2480 }
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2481
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2482 Statement parseStaticAssertStatement()
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2483 {
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2484 assert(token.type == T.Static);
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2485 nT();
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2486 assert(token.type == T.Assert);
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2487 nT();
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2488 Expression condition, message;
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2489 require(T.LParen);
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2490 condition = parseAssignExpression();
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2491 if (token.type == T.Comma)
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2492 {
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2493 nT();
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2494 message = parseAssignExpression();
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2495 }
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2496 require(T.RParen);
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2497 require(T.Semicolon);
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2498 return new StaticAssertStatement(condition, message);
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2499 }
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2500
190 d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2501 Statement parseDebugStatement()
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2502 {
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2503 assert(token.type == T.Debug);
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2504 nT(); // Skip debug keyword.
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2505
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	2506 Token* cond; // debug ( Integer )
50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	2507 // debug ( Identifier )
190 d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2508 Statement debugBody, elseBody;
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2509
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	2510 void parseIdentOrInt(ref Token* tok)
190 d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2511 {
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2512 nT();
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	2513 if (token.type == T.Int32 \|\|
50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	2514 token.type == T.Identifier)
50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	2515 {
50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	2516 tok = token;
50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	2517 nT();
50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	2518 }
190 d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2519 else
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2520 expected(T.Identifier); // TODO: better error msg
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2521 }
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2522
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2523 // if (token.type == T.Assign)
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2524 // {
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2525 // parseIdentOrInt(identSpec, levelSpec);
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2526 // require(T.Semicolon);
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2527 // }
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2528 // else
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2529 {
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2530 // Condition:
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2531 // Integer
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2532 // Identifier
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2533
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2534 // ( Condition )
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2535 if (token.type == T.LParen)
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2536 {
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	2537 parseIdentOrInt(cond);
190 d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2538 require(T.RParen);
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2539 }
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2540
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2541 // debug Statement
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2542 // debug ( Condition ) Statement
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2543 debugBody = parseNoScopeStatement();
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2544
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2545 // else Statement
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2546 if (token.type == T.Else)
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2547 {
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2548 // debug without condition and else body makes no sense
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2549 //if (levelCond == -1 && identCond.length == 0)
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2550 // TODO: issue error msg
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2551 nT();
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2552 elseBody = parseNoScopeStatement();
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2553 }
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2554 }
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2555
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	2556 return new DebugStatement(cond, debugBody, elseBody);
190 d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2557 }
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2558
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2559 Statement parseVersionStatement()
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2560 {
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2561 assert(token.type == T.Version);
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2562
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2563 nT(); // Skip version keyword.
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2564
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	2565 Token* cond; // version ( Integer )
50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	2566 // version ( Identifier )
190 d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2567 Statement versionBody, elseBody;
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2568
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	2569 void parseIdentOrInt(ref Token* tok)
190 d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2570 {
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	2571 if (token.type == T.Int32 \|\|
50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	2572 token.type == T.Identifier)
50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	2573 {
50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	2574 tok = token;
50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	2575 nT();
50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	2576 }
190 d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2577 else
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2578 expected(T.Identifier); // TODO: better error msg
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2579 }
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2580
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2581 // if (token.type == T.Assign)
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2582 // {
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2583 // parseIdentOrInt(identSpec, levelSpec);
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2584 // require(T.Semicolon);
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2585 // }
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2586 // else
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2587 {
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2588 // Condition:
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2589 // Integer
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2590 // Identifier
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2591
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2592 // ( Condition )
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2593 require(T.LParen);
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	2594 parseIdentOrInt(cond);
190 d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2595 require(T.RParen);
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2596
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2597 // version ( Condition ) Statement
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2598 versionBody = parseNoScopeStatement();
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2599
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2600 // else Statement
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2601 if (token.type == T.Else)
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2602 {
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2603 nT();
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2604 elseBody = parseNoScopeStatement();
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2605 }
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2606 }
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2607
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	2608 return new VersionStatement(cond, versionBody, elseBody);
190 d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2609 }
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2610
161 82c5cfc7d6d3 - Started implementation of parsing statements. aziz parents: 160 diff changeset	2611 /+++++++++++++++++++++++++++++
183 c9df82f6f6be - Added parseAsmStatement() stub. aziz parents: 182 diff changeset	2612 + Assembler parsing methods +
c9df82f6f6be - Added parseAsmStatement() stub. aziz parents: 182 diff changeset	2613 +++++++++++++++++++++++++++++/
c9df82f6f6be - Added parseAsmStatement() stub. aziz parents: 182 diff changeset	2614
c9df82f6f6be - Added parseAsmStatement() stub. aziz parents: 182 diff changeset	2615 Statement parseAsmStatement()
c9df82f6f6be - Added parseAsmStatement() stub. aziz parents: 182 diff changeset	2616 {
c9df82f6f6be - Added parseAsmStatement() stub. aziz parents: 182 diff changeset	2617 assert(token.type == T.Asm);
285 104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2618 nT(); // Skip asm keyword.
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2619 require(T.LBrace);
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2620 auto ss = new Statements;
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2621 while (token.type != T.RBrace && token.type != T.EOF)
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2622 ss ~= parseAsmInstruction();
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2623 require(T.RBrace);
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2624 return new AsmStatement(ss);
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2625 }
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2626
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2627 Statement parseAsmInstruction()
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 auto begin = token;
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2630 Statement s;
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	2631 Identifier* ident;
285 104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2632 switch (token.type)
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2633 {
374 6d22f0b6a674 - Added class AsmAlignStatement. aziz parents: 369 diff changeset	2634 // Keywords that are valid opcodes.
6d22f0b6a674 - Added class AsmAlignStatement. aziz parents: 369 diff changeset	2635 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	2636 ident = token.ident;
374 6d22f0b6a674 - Added class AsmAlignStatement. aziz parents: 369 diff changeset	2637 nT();
6d22f0b6a674 - Added class AsmAlignStatement. aziz parents: 369 diff changeset	2638 goto LOpcode;
285 104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2639 case T.Identifier:
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	2640 ident = token.ident;
374 6d22f0b6a674 - Added class AsmAlignStatement. aziz parents: 369 diff changeset	2641 nT(); // Skip Identifier
6d22f0b6a674 - Added class AsmAlignStatement. aziz parents: 369 diff changeset	2642 if (token.type == T.Colon)
285 104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2643 {
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2644 // Identifier : AsmInstruction
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2645 nT(); // Skip :
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2646 s = new LabeledStatement(ident, parseAsmInstruction());
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2647 break;
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2648 }
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2649
374 6d22f0b6a674 - Added class AsmAlignStatement. aziz parents: 369 diff changeset	2650 LOpcode:
285 104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2651 // Opcode ;
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2652 // Opcode Operands ;
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2653 // Opcode
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2654 // Identifier
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2655 Expression[] es;
374 6d22f0b6a674 - Added class AsmAlignStatement. aziz parents: 369 diff changeset	2656 if (token.type != T.Semicolon)
285 104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2657 {
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2658 while (1)
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2659 {
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2660 es ~= parseAsmExpression();
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2661 if (token.type != T.Comma)
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2662 break;
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2663 nT();
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2664 }
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 require(T.Semicolon);
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2667 s = new AsmInstruction(ident, es);
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2668 break;
374 6d22f0b6a674 - Added class AsmAlignStatement. aziz parents: 369 diff changeset	2669 case T.Align:
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	2670 // align Integer;
374 6d22f0b6a674 - Added class AsmAlignStatement. aziz parents: 369 diff changeset	2671 nT();
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	2672 int number = -1;
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	2673 if (token.type == T.Int32)
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	2674 (number = token.int_), nT();
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	2675 else
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	2676 error(token, MSG.ExpectedIntegerAfterAlign, token.srcText);
374 6d22f0b6a674 - Added class AsmAlignStatement. aziz parents: 369 diff changeset	2677 require(T.Semicolon);
6d22f0b6a674 - Added class AsmAlignStatement. aziz parents: 369 diff changeset	2678 s = new AsmAlignStatement(number);
6d22f0b6a674 - Added class AsmAlignStatement. aziz parents: 369 diff changeset	2679 break;
285 104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2680 case T.Semicolon:
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2681 s = new EmptyStatement();
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2682 nT();
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2683 break;
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2684 default:
496 5a607597dc22 Improved error recovery in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 495 diff changeset	2685 s = new IllegalAsmInstruction();
5a607597dc22 Improved error recovery in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 495 diff changeset	2686 // Skip to next valid token.
5a607597dc22 Improved error recovery in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 495 diff changeset	2687 do
5a607597dc22 Improved error recovery in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 495 diff changeset	2688 nT();
5a607597dc22 Improved error recovery in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 495 diff changeset	2689 while (!token.isAsmInstructionStart &&
5a607597dc22 Improved error recovery in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 495 diff changeset	2690 token.type != T.RBrace &&
5a607597dc22 Improved error recovery in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 495 diff changeset	2691 token.type != T.EOF)
5a607597dc22 Improved error recovery in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 495 diff changeset	2692 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	2693 error(begin, MSG.IllegalAsmInstructino ~ text);
285 104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2694 }
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2695 set(s, begin);
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2696 return s;
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2697 }
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2698
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2699 Expression parseAsmExpression()
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2700 {
287 211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2701 auto begin = token;
374 6d22f0b6a674 - Added class AsmAlignStatement. aziz parents: 369 diff changeset	2702 auto e = parseAsmOrOrExpression();
287 211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2703 if (token.type == T.Question)
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2704 {
293 418c6548ce17 - Assigning to Node.children in several constructors that inherit from Node. aziz parents: 292 diff changeset	2705 auto tok = token;
287 211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2706 nT();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2707 auto iftrue = parseAsmExpression();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2708 require(T.Colon);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2709 auto iffalse = parseAsmExpression();
293 418c6548ce17 - Assigning to Node.children in several constructors that inherit from Node. aziz parents: 292 diff changeset	2710 e = new CondExpression(e, iftrue, iffalse, tok);
287 211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2711 set(e, begin);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2712 }
288 833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2713 // TODO: create AsmExpression that contains e?
287 211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2714 return e;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2715 }
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 Expression parseAsmOrOrExpression()
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2718 {
375 0bd21b746a04 - Added code to main() for recognizing options to the importgraph command. aziz parents: 374 diff changeset	2719 alias parseAsmAndAndExpression parseNext;
287 211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2720 auto begin = token;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2721 auto e = parseNext();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2722 while (token.type == T.OrLogical)
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2723 {
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2724 auto tok = token;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2725 nT();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2726 e = new OrOrExpression(e, parseNext(), tok);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2727 set(e, begin);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2728 }
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2729 return e;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2730 }
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 Expression parseAsmAndAndExpression()
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2733 {
375 0bd21b746a04 - Added code to main() for recognizing options to the importgraph command. aziz parents: 374 diff changeset	2734 alias parseAsmOrExpression parseNext;
287 211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2735 auto begin = token;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2736 auto e = parseNext();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2737 while (token.type == T.AndLogical)
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2738 {
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2739 auto tok = token;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2740 nT();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2741 e = new AndAndExpression(e, parseNext(), tok);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2742 set(e, begin);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2743 }
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2744 return e;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2745 }
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 Expression parseAsmOrExpression()
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2748 {
375 0bd21b746a04 - Added code to main() for recognizing options to the importgraph command. aziz parents: 374 diff changeset	2749 alias parseAsmXorExpression parseNext;
287 211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2750 auto begin = token;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2751 auto e = parseNext();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2752 while (token.type == T.OrBinary)
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2753 {
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2754 auto tok = token;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2755 nT();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2756 e = new OrExpression(e, parseNext(), tok);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2757 set(e, begin);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2758 }
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2759 return e;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2760 }
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 Expression parseAsmXorExpression()
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2763 {
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2764 alias parseAsmAndExpression parseNext;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2765 auto begin = token;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2766 auto e = parseNext();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2767 while (token.type == T.Xor)
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 tok = token;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2770 nT();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2771 e = new XorExpression(e, parseNext(), tok);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2772 set(e, begin);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2773 }
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2774 return e;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2775 }
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2776
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2777 Expression parseAsmAndExpression()
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2778 {
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2779 alias parseAsmCmpExpression parseNext;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2780 auto begin = token;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2781 auto e = parseNext();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2782 while (token.type == T.AndBinary)
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2783 {
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2784 auto tok = token;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2785 nT();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2786 e = new AndExpression(e, parseNext(), tok);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2787 set(e, begin);
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 return e;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2790 }
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2791
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2792 Expression parseAsmCmpExpression()
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 alias parseAsmShiftExpression parseNext;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2795 auto begin = token;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2796 auto e = parseNext();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2797
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2798 auto operator = token;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2799 switch (operator.type)
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2800 {
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2801 case T.Equal, T.NotEqual:
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2802 nT();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2803 e = new EqualExpression(e, parseNext(), operator);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2804 break;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2805 case T.LessEqual, T.Less, T.GreaterEqual, T.Greater:
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2806 nT();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2807 e = new RelExpression(e, parseNext(), operator);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2808 break;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2809 default:
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2810 return e;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2811 }
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2812 set(e, begin);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2813 return e;
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
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2816 Expression parseAsmShiftExpression()
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 alias parseAsmAddExpression parseNext;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2819 auto begin = token;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2820 auto e = parseNext();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2821 while (1)
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2822 {
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2823 auto operator = token;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2824 switch (operator.type)
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2825 {
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2826 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	2827 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	2828 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	2829 default:
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2830 return e;
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 set(e, begin);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2833 }
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2834 assert(0);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2835 }
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 Expression parseAsmAddExpression()
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2838 {
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2839 alias parseAsmMulExpression parseNext;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2840 auto begin = token;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2841 auto e = parseNext();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2842 while (1)
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2843 {
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2844 auto operator = token;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2845 switch (operator.type)
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2846 {
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2847 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	2848 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	2849 // Not allowed in asm
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2850 //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	2851 default:
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2852 return e;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2853 }
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2854 set(e, begin);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2855 }
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2856 assert(0);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2857 }
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2858
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2859 Expression parseAsmMulExpression()
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2860 {
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2861 alias parseAsmPostExpression parseNext;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2862 auto begin = token;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2863 auto e = parseNext();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2864 while (1)
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 auto operator = token;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2867 switch (operator.type)
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2868 {
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2869 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	2870 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	2871 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	2872 default:
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2873 return e;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2874 }
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2875 set(e, begin);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2876 }
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2877 assert(0);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2878 }
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2879
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2880 Expression parseAsmPostExpression()
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2881 {
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2882 auto begin = token;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2883 auto e = parseAsmUnaryExpression();
374 6d22f0b6a674 - Added class AsmAlignStatement. aziz parents: 369 diff changeset	2884 while (token.type == T.LBracket)
287 211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2885 {
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2886 nT();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2887 e = parseAsmExpression();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2888 e = new AsmPostBracketExpression(e);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2889 require(T.RBracket);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2890 set(e, begin);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2891 }
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2892 return e;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2893 }
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2894
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2895 Expression parseAsmUnaryExpression()
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2896 {
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2897 auto begin = token;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2898 Expression e;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2899 switch (token.type)
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2900 {
374 6d22f0b6a674 - Added class AsmAlignStatement. aziz parents: 369 diff changeset	2901 case T.Byte, T.Short, T.Int,
6d22f0b6a674 - Added class AsmAlignStatement. aziz parents: 369 diff changeset	2902 T.Float, T.Double, T.Real:
6d22f0b6a674 - Added class AsmAlignStatement. aziz parents: 369 diff changeset	2903 goto LAsmTypePrefix;
287 211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2904 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	2905 switch (token.ident.identID)
287 211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2906 {
502 4e14cd1b24da Refactored code and added modules related to tabulated Identifiers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 501 diff changeset	2907 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	2908 ID.word, ID.dword, ID.qword/, "float", "double", "real"/:
374 6d22f0b6a674 - Added class AsmAlignStatement. aziz parents: 369 diff changeset	2909 LAsmTypePrefix:
287 211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2910 nT();
502 4e14cd1b24da Refactored code and added modules related to tabulated Identifiers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 501 diff changeset	2911 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	2912 nT();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2913 else
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2914 error(MID.ExpectedButFound, "ptr", token.srcText);
374 6d22f0b6a674 - Added class AsmAlignStatement. aziz parents: 369 diff changeset	2915 e = new AsmTypeExpression(parseAsmExpression());
287 211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2916 break;
502 4e14cd1b24da Refactored code and added modules related to tabulated Identifiers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 501 diff changeset	2917 case ID.offset:
287 211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2918 nT();
374 6d22f0b6a674 - Added class AsmAlignStatement. aziz parents: 369 diff changeset	2919 e = new AsmOffsetExpression(parseAsmExpression());
287 211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2920 break;
502 4e14cd1b24da Refactored code and added modules related to tabulated Identifiers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 501 diff changeset	2921 case ID.seg:
287 211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2922 nT();
374 6d22f0b6a674 - Added class AsmAlignStatement. aziz parents: 369 diff changeset	2923 e = new AsmSegExpression(parseAsmExpression());
287 211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2924 break;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2925 default:
374 6d22f0b6a674 - Added class AsmAlignStatement. aziz parents: 369 diff changeset	2926 goto LparseAsmPrimaryExpression;
287 211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2927 }
374 6d22f0b6a674 - Added class AsmAlignStatement. aziz parents: 369 diff changeset	2928 break;
287 211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2929 case T.Minus:
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2930 case T.Plus:
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2931 nT();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2932 e = new SignExpression(parseAsmUnaryExpression());
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2933 break;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2934 case T.Not:
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2935 nT();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2936 e = new NotExpression(parseAsmUnaryExpression());
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2937 break;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2938 case T.Tilde:
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2939 nT();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2940 e = new CompExpression(parseAsmUnaryExpression());
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2941 default:
374 6d22f0b6a674 - Added class AsmAlignStatement. aziz parents: 369 diff changeset	2942 LparseAsmPrimaryExpression:
287 211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2943 e = parseAsmPrimaryExpression();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2944 return e;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2945 }
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2946 set(e, begin);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2947 return e;
183 c9df82f6f6be - Added parseAsmStatement() stub. aziz parents: 182 diff changeset	2948 }
c9df82f6f6be - Added parseAsmStatement() stub. aziz parents: 182 diff changeset	2949
285 104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2950 Expression parseAsmPrimaryExpression()
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2951 {
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2952 auto begin = token;
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2953 Expression e;
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2954 switch (token.type)
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2955 {
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2956 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	2957 e = new IntExpression(token.type, token.ulong_);
285 104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2958 nT();
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2959 break;
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2960 case T.Float32, T.Float64, T.Float80,
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2961 T.Imaginary32, T.Imaginary64, T.Imaginary80:
399 ff1d11c27061 Renamed some Expression classes. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 398 diff changeset	2962 e = new RealExpression(token.type, token.real_);
285 104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2963 nT();
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2964 break;
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2965 case T.Dollar:
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2966 e = new DollarExpression();
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2967 nT();
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2968 break;
287 211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2969 case T.LBracket:
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2970 // [ AsmExpression ]
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2971 nT();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2972 e = parseAsmExpression();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2973 require(T.RBracket);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2974 e = new AsmBracketExpression(e);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2975 break;
288 833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2976 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	2977 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	2978 switch (register.identID)
288 833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2979 {
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2980 // __LOCAL_SIZE
502 4e14cd1b24da Refactored code and added modules related to tabulated Identifiers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 501 diff changeset	2981 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	2982 nT();
288 833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2983 e = new AsmLocalSizeExpression();
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2984 break;
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2985 // Register
502 4e14cd1b24da Refactored code and added modules related to tabulated Identifiers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 501 diff changeset	2986 case ID.ST:
288 833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2987 nT();
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2988 // (1) - (7)
502 4e14cd1b24da Refactored code and added modules related to tabulated Identifiers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 501 diff changeset	2989 int number = -1;
288 833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2990 if (token.type == T.LParen)
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2991 {
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2992 nT();
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2993 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	2994 (number = token.int_), nT();
288 833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2995 else
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2996 expected(T.Int32);
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2997 require(T.RParen);
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2998 }
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2999 e = new AsmRegisterExpression(register, number);
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	3000 break;
502 4e14cd1b24da Refactored code and added modules related to tabulated Identifiers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 501 diff changeset	3001 case ID.FS:
417 8af5c7e2f722 Fixed parsing asm FS register. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 415 diff changeset	3002 nT();
8af5c7e2f722 Fixed parsing asm FS register. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 415 diff changeset	3003 // 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	3004 int number = -1;
417 8af5c7e2f722 Fixed parsing asm FS register. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 415 diff changeset	3005 if (token.type == T.Colon)
8af5c7e2f722 Fixed parsing asm FS register. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 415 diff changeset	3006 {
8af5c7e2f722 Fixed parsing asm FS register. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 415 diff changeset	3007 // :0, :4, :8
8af5c7e2f722 Fixed parsing asm FS register. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 415 diff changeset	3008 nT();
502 4e14cd1b24da Refactored code and added modules related to tabulated Identifiers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 501 diff changeset	3009 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	3010 (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	3011 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	3012 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	3013 }
8af5c7e2f722 Fixed parsing asm FS register. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 415 diff changeset	3014 e = new AsmRegisterExpression(register, number);
8af5c7e2f722 Fixed parsing asm FS register. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 415 diff changeset	3015 break;
502 4e14cd1b24da Refactored code and added modules related to tabulated Identifiers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 501 diff changeset	3016 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	3017 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	3018 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	3019 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	3020 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	3021 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	3022 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	3023 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	3024 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	3025 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	3026 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	3027 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	3028 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	3029 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	3030 nT();
4e14cd1b24da Refactored code and added modules related to tabulated Identifiers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 501 diff changeset	3031 e = new AsmRegisterExpression(register);
288 833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	3032 break;
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	3033 default:
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	3034 // DotIdentifier
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	3035 Expression[] identList;
486 bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	3036 while (1)
288 833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	3037 {
486 bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	3038 auto begin2 = token;
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	3039 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	3040 e = new IdentifierExpression(ident);
288 833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	3041 set(e, begin2);
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	3042 identList ~= e;
486 bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	3043 if (token.type != T.Dot)
bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	3044 break;
bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	3045 nT(); // Skip dot.
288 833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	3046 }
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	3047 e = new DotListExpression(identList);
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	3048 }
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	3049 break;
285 104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	3050 default:
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	3051 error(MID.ExpectedButFound, "Expression", token.srcText);
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	3052 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	3053 if (!trying)
9c69615a4876 Added method insertEmptyTokenBefore() to Lexer. Made some fixes, too. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 409 diff changeset	3054 {
9c69615a4876 Added method insertEmptyTokenBefore() to Lexer. Made some fixes, too. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 409 diff changeset	3055 // 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	3056 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	3057 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	3058 }
285 104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	3059 }
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	3060 set(e, begin);
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	3061 return e;
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	3062 }
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	3063
183 c9df82f6f6be - Added parseAsmStatement() stub. aziz parents: 182 diff changeset	3064 /+++++++++++++++++++++++++++++
102 6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	3065 + Expression parsing methods +
6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	3066 +++++++++++++++++++++++++++++/
6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	3067
72 f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	3068 Expression parseExpression()
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	3069 {
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3070 auto begin = token;
72 f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	3071 auto e = parseAssignExpression();
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	3072 while (token.type == T.Comma)
235 3384ac8878f7 - Fixed parseExpression(). Forgot to skip T.Comma. aziz parents: 234 diff changeset	3073 {
251 67a798459532 - Added parameter Token* tok to some Expression constructors. Adapted parser accordingly. aziz parents: 250 diff changeset	3074 auto comma = token;
235 3384ac8878f7 - Fixed parseExpression(). Forgot to skip T.Comma. aziz parents: 234 diff changeset	3075 nT();
251 67a798459532 - Added parameter Token* tok to some Expression constructors. Adapted parser accordingly. aziz parents: 250 diff changeset	3076 e = new CommaExpression(e, parseAssignExpression(), comma);
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3077 set(e, begin);
235 3384ac8878f7 - Fixed parseExpression(). Forgot to skip T.Comma. aziz parents: 234 diff changeset	3078 }
72 f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	3079 return e;
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	3080 }
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	3081
71 b3777cca323c - Added Identity and NotIdentity tokens. aziz parents: 70 diff changeset	3082 Expression parseAssignExpression()
b3777cca323c - Added Identity and NotIdentity tokens. aziz parents: 70 diff changeset	3083 {
319 83f1f9a4f248 - Removed assigment to 'begin' from loop. Initializing 'begin' at decl point. aziz parents: 318 diff changeset	3084 auto begin = token;
71 b3777cca323c - Added Identity and NotIdentity tokens. aziz parents: 70 diff changeset	3085 auto e = parseCondExpression();
72 f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	3086 while (1)
71 b3777cca323c - Added Identity and NotIdentity tokens. aziz parents: 70 diff changeset	3087 {
87 c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	3088 switch (token.type)
72 f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	3089 {
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	3090 case T.Assign:
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	3091 nT(); e = new AssignExpression(e, parseAssignExpression());
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	3092 break;
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	3093 case T.LShiftAssign:
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	3094 nT(); e = new LShiftAssignExpression(e, parseAssignExpression());
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	3095 break;
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	3096 case T.RShiftAssign:
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	3097 nT(); e = new RShiftAssignExpression(e, parseAssignExpression());
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	3098 break;
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	3099 case T.URShiftAssign:
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	3100 nT(); e = new URShiftAssignExpression(e, parseAssignExpression());
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	3101 break;
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	3102 case T.OrAssign:
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	3103 nT(); e = new OrAssignExpression(e, parseAssignExpression());
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	3104 break;
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	3105 case T.AndAssign:
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	3106 nT(); e = new AndAssignExpression(e, parseAssignExpression());
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	3107 break;
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	3108 case T.PlusAssign:
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	3109 nT(); e = new PlusAssignExpression(e, parseAssignExpression());
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	3110 break;
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	3111 case T.MinusAssign:
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	3112 nT(); e = new MinusAssignExpression(e, parseAssignExpression());
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	3113 break;
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	3114 case T.DivAssign:
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	3115 nT(); e = new DivAssignExpression(e, parseAssignExpression());
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	3116 break;
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	3117 case T.MulAssign:
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	3118 nT(); e = new MulAssignExpression(e, parseAssignExpression());
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	3119 break;
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	3120 case T.ModAssign:
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	3121 nT(); e = new ModAssignExpression(e, parseAssignExpression());
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	3122 break;
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	3123 case T.XorAssign:
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	3124 nT(); e = new XorAssignExpression(e, parseAssignExpression());
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	3125 break;
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	3126 case T.CatAssign:
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	3127 nT(); e = new CatAssignExpression(e, parseAssignExpression());
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	3128 break;
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	3129 default:
218 6c0d274e0f3f - Removed goto from parseAssignExpression(). aziz parents: 217 diff changeset	3130 return e;
72 f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	3131 }
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3132 set(e, begin);
71 b3777cca323c - Added Identity and NotIdentity tokens. aziz parents: 70 diff changeset	3133 }
b3777cca323c - Added Identity and NotIdentity tokens. aziz parents: 70 diff changeset	3134 return e;
b3777cca323c - Added Identity and NotIdentity tokens. aziz parents: 70 diff changeset	3135 }
72 f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	3136
71 b3777cca323c - Added Identity and NotIdentity tokens. aziz parents: 70 diff changeset	3137 Expression parseCondExpression()
b3777cca323c - Added Identity and NotIdentity tokens. aziz parents: 70 diff changeset	3138 {
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3139 auto begin = token;
72 f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	3140 auto e = parseOrOrExpression();
87 c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	3141 if (token.type == T.Question)
72 f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	3142 {
293 418c6548ce17 - Assigning to Node.children in several constructors that inherit from Node. aziz parents: 292 diff changeset	3143 auto tok = token;
72 f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	3144 nT();
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	3145 auto iftrue = parseExpression();
87 c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	3146 require(T.Colon);
72 f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	3147 auto iffalse = parseCondExpression();
293 418c6548ce17 - Assigning to Node.children in several constructors that inherit from Node. aziz parents: 292 diff changeset	3148 e = new CondExpression(e, iftrue, iffalse, tok);
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3149 set(e, begin);
72 f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	3150 }
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	3151 return e;
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	3152 }
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	3153
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	3154 Expression parseOrOrExpression()
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	3155 {
486 bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	3156 alias parseAndAndExpression parseNext;
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3157 auto begin = token;
73 11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3158 auto e = parseNext();
223 043722eed46e - Fix: if-statements should be while-statements. aziz parents: 222 diff changeset	3159 while (token.type == T.OrLogical)
73 11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3160 {
251 67a798459532 - Added parameter Token* tok to some Expression constructors. Adapted parser accordingly. aziz parents: 250 diff changeset	3161 auto tok = token;
73 11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3162 nT();
251 67a798459532 - Added parameter Token* tok to some Expression constructors. Adapted parser accordingly. aziz parents: 250 diff changeset	3163 e = new OrOrExpression(e, parseNext(), tok);
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3164 set(e, begin);
73 11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3165 }
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3166 return e;
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3167 }
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 Expression parseAndAndExpression()
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3170 {
486 bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	3171 alias parseOrExpression parseNext;
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3172 auto begin = token;
73 11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3173 auto e = parseNext();
223 043722eed46e - Fix: if-statements should be while-statements. aziz parents: 222 diff changeset	3174 while (token.type == T.AndLogical)
73 11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3175 {
251 67a798459532 - Added parameter Token* tok to some Expression constructors. Adapted parser accordingly. aziz parents: 250 diff changeset	3176 auto tok = token;
73 11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3177 nT();
251 67a798459532 - Added parameter Token* tok to some Expression constructors. Adapted parser accordingly. aziz parents: 250 diff changeset	3178 e = new AndAndExpression(e, parseNext(), tok);
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3179 set(e, begin);
73 11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3180 }
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3181 return e;
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3182 }
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 Expression parseOrExpression()
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3185 {
486 bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	3186 alias parseXorExpression parseNext;
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3187 auto begin = token;
73 11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3188 auto e = parseNext();
223 043722eed46e - Fix: if-statements should be while-statements. aziz parents: 222 diff changeset	3189 while (token.type == T.OrBinary)
73 11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3190 {
251 67a798459532 - Added parameter Token* tok to some Expression constructors. Adapted parser accordingly. aziz parents: 250 diff changeset	3191 auto tok = token;
73 11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3192 nT();
251 67a798459532 - Added parameter Token* tok to some Expression constructors. Adapted parser accordingly. aziz parents: 250 diff changeset	3193 e = new OrExpression(e, parseNext(), tok);
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3194 set(e, begin);
73 11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3195 }
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3196 return e;
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3197 }
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 Expression parseXorExpression()
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3200 {
486 bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	3201 alias parseAndExpression parseNext;
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3202 auto begin = token;
73 11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3203 auto e = parseNext();
223 043722eed46e - Fix: if-statements should be while-statements. aziz parents: 222 diff changeset	3204 while (token.type == T.Xor)
73 11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3205 {
251 67a798459532 - Added parameter Token* tok to some Expression constructors. Adapted parser accordingly. aziz parents: 250 diff changeset	3206 auto tok = token;
73 11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3207 nT();
251 67a798459532 - Added parameter Token* tok to some Expression constructors. Adapted parser accordingly. aziz parents: 250 diff changeset	3208 e = new XorExpression(e, parseNext(), tok);
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3209 set(e, begin);
73 11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3210 }
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3211 return e;
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3212 }
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3213
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3214 Expression parseAndExpression()
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3215 {
486 bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	3216 alias parseCmpExpression parseNext;
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3217 auto begin = token;
73 11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3218 auto e = parseNext();
223 043722eed46e - Fix: if-statements should be while-statements. aziz parents: 222 diff changeset	3219 while (token.type == T.AndBinary)
73 11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3220 {
251 67a798459532 - Added parameter Token* tok to some Expression constructors. Adapted parser accordingly. aziz parents: 250 diff changeset	3221 auto tok = token;
73 11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3222 nT();
251 67a798459532 - Added parameter Token* tok to some Expression constructors. Adapted parser accordingly. aziz parents: 250 diff changeset	3223 e = new AndExpression(e, parseNext(), tok);
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3224 set(e, begin);
73 11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3225 }
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3226 return e;
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3227 }
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3228
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3229 Expression parseCmpExpression()
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3230 {
486 bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	3231 alias parseShiftExpression parseNext;
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3232 auto begin = token;
74 30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	3233 auto e = parseShiftExpression();
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 auto operator = token;
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3236 switch (operator.type)
74 30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	3237 {
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	3238 case T.Equal, T.NotEqual:
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	3239 nT();
486 bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	3240 e = new EqualExpression(e, parseNext(), operator);
74 30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	3241 break;
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	3242 case T.Not:
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	3243 if (peekNext() != T.Is)
74 30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	3244 break;
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	3245 nT();
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3246 // fall through
225 8883c113c2f1 - Fix: case T.Identity should be T.Is. aziz parents: 224 diff changeset	3247 case T.Is:
74 30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	3248 nT();
486 bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	3249 e = new IdentityExpression(e, parseNext(), operator);
74 30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	3250 break;
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	3251 case T.LessEqual, T.Less, T.GreaterEqual, T.Greater,
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	3252 T.Unordered, T.UorE, T.UorG, T.UorGorE,
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	3253 T.UorL, T.UorLorE, T.LorEorG, T.LorG:
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	3254 nT();
486 bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	3255 e = new RelExpression(e, parseNext(), operator);
74 30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	3256 break;
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	3257 case T.In:
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	3258 nT();
486 bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	3259 e = new InExpression(e, parseNext(), operator);
74 30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	3260 break;
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	3261 default:
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3262 return e;
74 30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	3263 }
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3264 set(e, begin);
74 30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	3265 return e;
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	3266 }
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	3267
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	3268 Expression parseShiftExpression()
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	3269 {
486 bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	3270 alias parseAddExpression parseNext;
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3271 auto begin = token;
486 bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	3272 auto e = parseNext();
75 3f976d9e0833 - Implemented parseShiftExpression(). aziz parents: 74 diff changeset	3273 while (1)
3f976d9e0833 - Implemented parseShiftExpression(). aziz parents: 74 diff changeset	3274 {
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3275 auto operator = token;
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3276 switch (operator.type)
75 3f976d9e0833 - Implemented parseShiftExpression(). aziz parents: 74 diff changeset	3277 {
486 bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	3278 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	3279 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	3280 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	3281 default:
a4c5ee9527b7 - Replaced assert(0); with break; in case T.Static. Renamed local t to next. aziz parents: 227 diff changeset	3282 return e;
75 3f976d9e0833 - Implemented parseShiftExpression(). aziz parents: 74 diff changeset	3283 }
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3284 set(e, begin);
75 3f976d9e0833 - Implemented parseShiftExpression(). aziz parents: 74 diff changeset	3285 }
228 a4c5ee9527b7 - Replaced assert(0); with break; in case T.Static. Renamed local t to next. aziz parents: 227 diff changeset	3286 assert(0);
75 3f976d9e0833 - Implemented parseShiftExpression(). aziz parents: 74 diff changeset	3287 }
3f976d9e0833 - Implemented parseShiftExpression(). aziz parents: 74 diff changeset	3288
3f976d9e0833 - Implemented parseShiftExpression(). aziz parents: 74 diff changeset	3289 Expression parseAddExpression()
3f976d9e0833 - Implemented parseShiftExpression(). aziz parents: 74 diff changeset	3290 {
486 bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	3291 alias parseMulExpression parseNext;
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3292 auto begin = token;
486 bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	3293 auto e = parseNext();
76 a85f9edf6ce7 - Implemented parseAddExpression(). aziz parents: 75 diff changeset	3294 while (1)
a85f9edf6ce7 - Implemented parseAddExpression(). aziz parents: 75 diff changeset	3295 {
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3296 auto operator = token;
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3297 switch (operator.type)
76 a85f9edf6ce7 - Implemented parseAddExpression(). aziz parents: 75 diff changeset	3298 {
486 bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	3299 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	3300 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	3301 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	3302 default:
a4c5ee9527b7 - Replaced assert(0); with break; in case T.Static. Renamed local t to next. aziz parents: 227 diff changeset	3303 return e;
76 a85f9edf6ce7 - Implemented parseAddExpression(). aziz parents: 75 diff changeset	3304 }
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3305 set(e, begin);
76 a85f9edf6ce7 - Implemented parseAddExpression(). aziz parents: 75 diff changeset	3306 }
228 a4c5ee9527b7 - Replaced assert(0); with break; in case T.Static. Renamed local t to next. aziz parents: 227 diff changeset	3307 assert(0);
76 a85f9edf6ce7 - Implemented parseAddExpression(). aziz parents: 75 diff changeset	3308 }
a85f9edf6ce7 - Implemented parseAddExpression(). aziz parents: 75 diff changeset	3309
a85f9edf6ce7 - Implemented parseAddExpression(). aziz parents: 75 diff changeset	3310 Expression parseMulExpression()
a85f9edf6ce7 - Implemented parseAddExpression(). aziz parents: 75 diff changeset	3311 {
335 b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3312 alias parsePostExpression parseNext;
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3313 auto begin = token;
335 b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3314 auto e = parseNext();
77 7e21c4df1c02 - Implemented parseMulExpression(). aziz parents: 76 diff changeset	3315 while (1)
7e21c4df1c02 - Implemented parseMulExpression(). aziz parents: 76 diff changeset	3316 {
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3317 auto operator = token;
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3318 switch (operator.type)
77 7e21c4df1c02 - Implemented parseMulExpression(). aziz parents: 76 diff changeset	3319 {
335 b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3320 case T.Mul: nT(); e = new MulExpression(e, parseNext(), operator); break;
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3321 case T.Div: nT(); e = new DivExpression(e, parseNext(), operator); break;
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3322 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	3323 default:
a4c5ee9527b7 - Replaced assert(0); with break; in case T.Static. Renamed local t to next. aziz parents: 227 diff changeset	3324 return e;
77 7e21c4df1c02 - Implemented parseMulExpression(). aziz parents: 76 diff changeset	3325 }
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3326 set(e, begin);
77 7e21c4df1c02 - Implemented parseMulExpression(). aziz parents: 76 diff changeset	3327 }
228 a4c5ee9527b7 - Replaced assert(0); with break; in case T.Static. Renamed local t to next. aziz parents: 227 diff changeset	3328 assert(0);
71 b3777cca323c - Added Identity and NotIdentity tokens. aziz parents: 70 diff changeset	3329 }
b3777cca323c - Added Identity and NotIdentity tokens. aziz parents: 70 diff changeset	3330
335 b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3331 Expression parsePostExpression()
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3332 {
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3333 auto begin = token;
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3334 auto e = parseUnaryExpression();
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3335 while (1)
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3336 {
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3337 switch (token.type)
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3338 {
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3339 case T.Dot:
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3340 e = new PostDotListExpression(e, parseDotListExpression());
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3341 goto Lset;
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3342 case T.PlusPlus:
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3343 e = new PostIncrExpression(e);
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3344 break;
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3345 case T.MinusMinus:
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3346 e = new PostDecrExpression(e);
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3347 break;
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3348 case T.LParen:
486 bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	3349 e = new CallExpression(e, parseArguments());
335 b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3350 goto Lset;
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3351 case T.LBracket:
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3352 // parse Slice- and IndexExpression
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3353 nT();
489 a7291d3ee9d7 Refactored classes that inherit from Node. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 488 diff changeset	3354 // [] is a SliceExpression
335 b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3355 if (token.type == T.RBracket)
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3356 {
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3357 e = new SliceExpression(e, null, null);
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3358 break;
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3359 }
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3360
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3361 Expression[] es = [parseAssignExpression()];
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3362
489 a7291d3ee9d7 Refactored classes that inherit from Node. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 488 diff changeset	3363 // [ AssignExpression .. AssignExpression ]
335 b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3364 if (token.type == T.Slice)
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3365 {
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3366 nT();
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3367 e = new SliceExpression(e, es[0], parseAssignExpression());
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3368 require(T.RBracket);
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3369 goto Lset;
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3370 }
486 bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	3371
489 a7291d3ee9d7 Refactored classes that inherit from Node. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 488 diff changeset	3372 // [ ExpressionList ]
486 bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	3373 if (token.type == T.Comma)
335 b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3374 {
486 bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	3375 nT();
bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	3376 es ~= parseExpressionList();
335 b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3377 }
486 bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	3378 require(T.RBracket);
335 b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3379
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3380 e = new IndexExpression(e, es);
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3381 goto Lset;
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3382 default:
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3383 return e;
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3384 }
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3385 nT();
489 a7291d3ee9d7 Refactored classes that inherit from Node. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 488 diff changeset	3386 Lset: // Jumped here to skip nT().
335 b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3387 set(e, begin);
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3388 }
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3389 assert(0);
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3390 }
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3391
91 ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3392 Expression parseUnaryExpression()
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3393 {
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3394 auto begin = token;
91 ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3395 Expression e;
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3396 switch (token.type)
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3397 {
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3398 case T.AndBinary:
257 6c58366ba1eb - Fix: need to allocate Parameters. aziz parents: 256 diff changeset	3399 nT();
243 461e544ebb53 - Added method requireId(). aziz parents: 242 diff changeset	3400 e = new AddressExpression(parseUnaryExpression());
91 ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3401 break;
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3402 case T.PlusPlus:
257 6c58366ba1eb - Fix: need to allocate Parameters. aziz parents: 256 diff changeset	3403 nT();
243 461e544ebb53 - Added method requireId(). aziz parents: 242 diff changeset	3404 e = new PreIncrExpression(parseUnaryExpression());
91 ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3405 break;
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3406 case T.MinusMinus:
257 6c58366ba1eb - Fix: need to allocate Parameters. aziz parents: 256 diff changeset	3407 nT();
243 461e544ebb53 - Added method requireId(). aziz parents: 242 diff changeset	3408 e = new PreDecrExpression(parseUnaryExpression());
91 ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3409 break;
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3410 case T.Mul:
257 6c58366ba1eb - Fix: need to allocate Parameters. aziz parents: 256 diff changeset	3411 nT();
243 461e544ebb53 - Added method requireId(). aziz parents: 242 diff changeset	3412 e = new DerefExpression(parseUnaryExpression());
91 ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3413 break;
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3414 case T.Minus:
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3415 case T.Plus:
257 6c58366ba1eb - Fix: need to allocate Parameters. aziz parents: 256 diff changeset	3416 nT();
243 461e544ebb53 - Added method requireId(). aziz parents: 242 diff changeset	3417 e = new SignExpression(parseUnaryExpression());
91 ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3418 break;
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3419 case T.Not:
257 6c58366ba1eb - Fix: need to allocate Parameters. aziz parents: 256 diff changeset	3420 nT();
243 461e544ebb53 - Added method requireId(). aziz parents: 242 diff changeset	3421 e = new NotExpression(parseUnaryExpression());
91 ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3422 break;
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3423 case T.Tilde:
257 6c58366ba1eb - Fix: need to allocate Parameters. aziz parents: 256 diff changeset	3424 nT();
243 461e544ebb53 - Added method requireId(). aziz parents: 242 diff changeset	3425 e = new CompExpression(parseUnaryExpression());
91 ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3426 break;
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3427 case T.New:
154 0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	3428 e = parseNewExpression();
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3429 return e;
91 ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3430 case T.Delete:
257 6c58366ba1eb - Fix: need to allocate Parameters. aziz parents: 256 diff changeset	3431 nT();
243 461e544ebb53 - Added method requireId(). aziz parents: 242 diff changeset	3432 e = new DeleteExpression(parseUnaryExpression());
91 ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3433 break;
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3434 case T.Cast:
99 6b8c248f5911 - Added member type to classes CastExpression and TypeidExpression. aziz parents: 98 diff changeset	3435 requireNext(T.LParen);
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3436 Type type;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3437 switch (token.type)
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3438 {
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3439 version(D2)
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3440 {
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3441 auto begin2 = token;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3442 case T.Const:
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3443 type = new ConstType(null);
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3444 goto case_break;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3445 case T.Invariant:
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3446 type = new InvariantType(null);
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3447 case_break:
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3448 nT();
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3449 set(type, begin2);
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3450 break;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3451 }
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3452 default:
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3453 type = parseType();
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3454 }
99 6b8c248f5911 - Added member type to classes CastExpression and TypeidExpression. aziz parents: 98 diff changeset	3455 require(T.RParen);
6b8c248f5911 - Added member type to classes CastExpression and TypeidExpression. aziz parents: 98 diff changeset	3456 e = new CastExpression(parseUnaryExpression(), type);
257 6c58366ba1eb - Fix: need to allocate Parameters. aziz parents: 256 diff changeset	3457 break;
91 ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3458 case T.LParen:
102 6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	3459 // ( Type ) . Identifier
225 8883c113c2f1 - Fix: case T.Identity should be T.Is. aziz parents: 224 diff changeset	3460 Type parseType_()
8883c113c2f1 - Fix: case T.Identity should be T.Is. aziz parents: 224 diff changeset	3461 {
8883c113c2f1 - Fix: case T.Identity should be T.Is. aziz parents: 224 diff changeset	3462 nT();
8883c113c2f1 - Fix: case T.Identity should be T.Is. aziz parents: 224 diff changeset	3463 auto type = parseType();
8883c113c2f1 - Fix: case T.Identity should be T.Is. aziz parents: 224 diff changeset	3464 require(T.RParen);
233 c2b601dcd57d - Added assert to parseDotListExpression(). aziz parents: 232 diff changeset	3465 require(T.Dot);
225 8883c113c2f1 - Fix: case T.Identity should be T.Is. aziz parents: 224 diff changeset	3466 return type;
8883c113c2f1 - Fix: case T.Identity should be T.Is. aziz parents: 224 diff changeset	3467 }
8883c113c2f1 - Fix: case T.Identity should be T.Is. aziz parents: 224 diff changeset	3468 bool success;
423 6057113f9a44 Refactored Parser.try_(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 422 diff changeset	3469 auto type = try_(&parseType_, success);
225 8883c113c2f1 - Fix: case T.Identity should be T.Is. aziz parents: 224 diff changeset	3470 if (success)
8883c113c2f1 - Fix: case T.Identity should be T.Is. aziz parents: 224 diff changeset	3471 {
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	3472 auto ident = requireIdentifier(MSG.ExpectedIdAfterTypeDot);
225 8883c113c2f1 - Fix: case T.Identity should be T.Is. aziz parents: 224 diff changeset	3473 e = new TypeDotIdExpression(type, ident);
257 6c58366ba1eb - Fix: need to allocate Parameters. aziz parents: 256 diff changeset	3474 break;
225 8883c113c2f1 - Fix: case T.Identity should be T.Is. aziz parents: 224 diff changeset	3475 }
8883c113c2f1 - Fix: case T.Identity should be T.Is. aziz parents: 224 diff changeset	3476 goto default;
91 ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3477 default:
335 b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3478 e = parsePrimaryExpression();
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3479 return e;
91 ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3480 }
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3481 assert(e !is null);
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3482 set(e, begin);
91 ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3483 return e;
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3484 }
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3485
79 df4e5c7ad58a - Implemented most of parsePostExpression() and parsePreExpression(). aziz parents: 78 diff changeset	3486 Expression parsePrimaryExpression()
78 f043759fb59a - Added code to parseUnaryExpression(); not fully implemented. aziz parents: 77 diff changeset	3487 {
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3488 auto begin = token;
83 9e6d66f647c9 - Fix: IsExpression was created instead of IdentityExpression. aziz parents: 81 diff changeset	3489 Expression e;
87 c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	3490 switch (token.type)
83 9e6d66f647c9 - Fix: IsExpression was created instead of IdentityExpression. aziz parents: 81 diff changeset	3491 {
154 0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	3492 case T.Identifier, T.Dot, T.Typeof:
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	3493 e = parseDotListExpression();
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	3494 break;
84 ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3495 case T.This:
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3496 nT();
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3497 e = new ThisExpression();
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.Super:
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3500 nT();
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3501 e = new SuperExpression();
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3502 break;
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3503 case T.Null:
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3504 nT();
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3505 e = new NullExpression();
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3506 break;
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3507 case T.True, T.False:
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3508 nT();
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3509 e = new BoolExpression();
84 ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3510 break;
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3511 case T.Dollar:
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3512 nT();
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3513 e = new DollarExpression();
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3514 break;
97 1a83e5070a84 - Added code for parsing IntNumber- and RealNumberExpressions. aziz parents: 96 diff changeset	3515 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	3516 e = new IntExpression(token.type, token.ulong_);
97 1a83e5070a84 - Added code for parsing IntNumber- and RealNumberExpressions. aziz parents: 96 diff changeset	3517 nT();
1a83e5070a84 - Added code for parsing IntNumber- and RealNumberExpressions. aziz parents: 96 diff changeset	3518 break;
1a83e5070a84 - Added code for parsing IntNumber- and RealNumberExpressions. aziz parents: 96 diff changeset	3519 case T.Float32, T.Float64, T.Float80,
1a83e5070a84 - Added code for parsing IntNumber- and RealNumberExpressions. aziz parents: 96 diff changeset	3520 T.Imaginary32, T.Imaginary64, T.Imaginary80:
399 ff1d11c27061 Renamed some Expression classes. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 398 diff changeset	3521 e = new RealExpression(token.type, token.real_);
97 1a83e5070a84 - Added code for parsing IntNumber- and RealNumberExpressions. aziz parents: 96 diff changeset	3522 nT();
84 ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3523 break;
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3524 case T.CharLiteral, T.WCharLiteral, T.DCharLiteral:
486 bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	3525 e = new CharExpression(token);
84 ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3526 nT();
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3527 break;
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3528 case T.String:
157 fdbd47d72614 - Renamed class StringLiteralExpression to StringLiteralsExpression. aziz parents: 156 diff changeset	3529 Token*[] stringLiterals;
fdbd47d72614 - Renamed class StringLiteralExpression to StringLiteralsExpression. aziz parents: 156 diff changeset	3530 do
84 ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3531 {
157 fdbd47d72614 - Renamed class StringLiteralExpression to StringLiteralsExpression. aziz parents: 156 diff changeset	3532 stringLiterals ~= token;
84 ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3533 nT();
157 fdbd47d72614 - Renamed class StringLiteralExpression to StringLiteralsExpression. aziz parents: 156 diff changeset	3534 } while (token.type == T.String)
399 ff1d11c27061 Renamed some Expression classes. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 398 diff changeset	3535 e = new StringExpression(stringLiterals);
84 ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3536 break;
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3537 case T.LBracket:
85 d8dc3171440d - Fixed parsing CallExpression and IndexExpression. aziz parents: 84 diff changeset	3538 Expression[] values;
d8dc3171440d - Fixed parsing CallExpression and IndexExpression. aziz parents: 84 diff changeset	3539
d8dc3171440d - Fixed parsing CallExpression and IndexExpression. aziz parents: 84 diff changeset	3540 nT();
87 c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	3541 if (token.type != T.RBracket)
85 d8dc3171440d - Fixed parsing CallExpression and IndexExpression. aziz parents: 84 diff changeset	3542 {
d8dc3171440d - Fixed parsing CallExpression and IndexExpression. aziz parents: 84 diff changeset	3543 e = parseAssignExpression();
87 c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	3544 if (token.type == T.Colon)
85 d8dc3171440d - Fixed parsing CallExpression and IndexExpression. aziz parents: 84 diff changeset	3545 goto LparseAssocArray;
486 bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	3546 if (token.type == T.Comma)
bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	3547 {
bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	3548 nT();
bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	3549 values = [e] ~ parseExpressionList();
bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	3550 }
bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	3551 require(T.RBracket);
85 d8dc3171440d - Fixed parsing CallExpression and IndexExpression. aziz parents: 84 diff changeset	3552 }
271 68987c1c59b6 - Fixed parsing empty ArrayLiteralExpression. Needed to skip T.RBracket. aziz parents: 270 diff changeset	3553 else
68987c1c59b6 - Fixed parsing empty ArrayLiteralExpression. Needed to skip T.RBracket. aziz parents: 270 diff changeset	3554 nT();
85 d8dc3171440d - Fixed parsing CallExpression and IndexExpression. aziz parents: 84 diff changeset	3555
d8dc3171440d - Fixed parsing CallExpression and IndexExpression. aziz parents: 84 diff changeset	3556 e = new ArrayLiteralExpression(values);
d8dc3171440d - Fixed parsing CallExpression and IndexExpression. aziz parents: 84 diff changeset	3557 break;
d8dc3171440d - Fixed parsing CallExpression and IndexExpression. aziz parents: 84 diff changeset	3558
d8dc3171440d - Fixed parsing CallExpression and IndexExpression. aziz parents: 84 diff changeset	3559 LparseAssocArray:
d8dc3171440d - Fixed parsing CallExpression and IndexExpression. aziz parents: 84 diff changeset	3560 Expression[] keys;
d8dc3171440d - Fixed parsing CallExpression and IndexExpression. aziz parents: 84 diff changeset	3561
d8dc3171440d - Fixed parsing CallExpression and IndexExpression. aziz parents: 84 diff changeset	3562 keys ~= e;
d8dc3171440d - Fixed parsing CallExpression and IndexExpression. aziz parents: 84 diff changeset	3563 nT(); // Skip colon.
271 68987c1c59b6 - Fixed parsing empty ArrayLiteralExpression. Needed to skip T.RBracket. aziz parents: 270 diff changeset	3564 goto LenterLoop;
68987c1c59b6 - Fixed parsing empty ArrayLiteralExpression. Needed to skip T.RBracket. aziz parents: 270 diff changeset	3565
68987c1c59b6 - Fixed parsing empty ArrayLiteralExpression. Needed to skip T.RBracket. aziz parents: 270 diff changeset	3566 while (1)
88 81cb24669ed3 - Fixed parser of AssocArrayLiteralExpression. aziz parents: 87 diff changeset	3567 {
271 68987c1c59b6 - Fixed parsing empty ArrayLiteralExpression. Needed to skip T.RBracket. aziz parents: 270 diff changeset	3568 keys ~= parseAssignExpression();
68987c1c59b6 - Fixed parsing empty ArrayLiteralExpression. Needed to skip T.RBracket. aziz parents: 270 diff changeset	3569 require(T.Colon);
68987c1c59b6 - Fixed parsing empty ArrayLiteralExpression. Needed to skip T.RBracket. aziz parents: 270 diff changeset	3570 LenterLoop:
68987c1c59b6 - Fixed parsing empty ArrayLiteralExpression. Needed to skip T.RBracket. aziz parents: 270 diff changeset	3571 values ~= parseAssignExpression();
68987c1c59b6 - Fixed parsing empty ArrayLiteralExpression. Needed to skip T.RBracket. aziz parents: 270 diff changeset	3572 if (token.type != T.Comma)
68987c1c59b6 - Fixed parsing empty ArrayLiteralExpression. Needed to skip T.RBracket. aziz parents: 270 diff changeset	3573 break;
68987c1c59b6 - Fixed parsing empty ArrayLiteralExpression. Needed to skip T.RBracket. aziz parents: 270 diff changeset	3574 nT();
88 81cb24669ed3 - Fixed parser of AssocArrayLiteralExpression. aziz parents: 87 diff changeset	3575 }
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3576 require(T.RBracket);
399 ff1d11c27061 Renamed some Expression classes. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 398 diff changeset	3577 e = new AArrayLiteralExpression(keys, values);
84 ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3578 break;
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3579 case T.LBrace:
193 2a2975b6d539 - Using parseFunctionBody() when parsing FunctionLiteralExpression. aziz parents: 192 diff changeset	3580 // DelegateLiteral := { Statements }
267 f3dfa6208ed3 - Removed parameter func from parseFunctionBody(). Creating new FunctionBody inside the method. aziz parents: 266 diff changeset	3581 auto funcBody = parseFunctionBody();
289 a99357783c6f - Fix: assign targs to member targs of TraitsExpression. aziz parents: 288 diff changeset	3582 e = new FunctionLiteralExpression(funcBody);
84 ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3583 break;
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3584 case T.Function, T.Delegate:
193 2a2975b6d539 - Using parseFunctionBody() when parsing FunctionLiteralExpression. aziz parents: 192 diff changeset	3585 // FunctionLiteral := (function\|delegate) Type? '(' ArgumentList ')' '{' Statements '}'
133 3924b1ee1302 - Added code for parsing function and delegate literal expressions. aziz parents: 132 diff changeset	3586 nT(); // Skip function\|delegate token.
3924b1ee1302 - Added code for parsing function and delegate literal expressions. aziz parents: 132 diff changeset	3587 Type returnType;
3924b1ee1302 - Added code for parsing function and delegate literal expressions. aziz parents: 132 diff changeset	3588 Parameters parameters;
3924b1ee1302 - Added code for parsing function and delegate literal expressions. aziz parents: 132 diff changeset	3589 if (token.type != T.LBrace)
3924b1ee1302 - Added code for parsing function and delegate literal expressions. aziz parents: 132 diff changeset	3590 {
3924b1ee1302 - Added code for parsing function and delegate literal expressions. aziz parents: 132 diff changeset	3591 if (token.type != T.LParen) // Optional return type
3924b1ee1302 - Added code for parsing function and delegate literal expressions. aziz parents: 132 diff changeset	3592 returnType = parseType();
143 e760d7552f66 - Renamed parseArgumentList() to parseArguments(). aziz parents: 141 diff changeset	3593 parameters = parseParameterList();
133 3924b1ee1302 - Added code for parsing function and delegate literal expressions. aziz parents: 132 diff changeset	3594 }
267 f3dfa6208ed3 - Removed parameter func from parseFunctionBody(). Creating new FunctionBody inside the method. aziz parents: 266 diff changeset	3595 auto funcBody = parseFunctionBody();
289 a99357783c6f - Fix: assign targs to member targs of TraitsExpression. aziz parents: 288 diff changeset	3596 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	3597 break;
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3598 case T.Assert:
86 0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	3599 Expression msg;
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	3600 requireNext(T.LParen);
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	3601 e = parseAssignExpression();
87 c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	3602 if (token.type == T.Comma)
86 0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	3603 {
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	3604 nT();
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	3605 msg = parseAssignExpression();
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	3606 }
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	3607 require(T.RParen);
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	3608 e = new AssertExpression(e, msg);
84 ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3609 break;
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3610 case T.Mixin:
86 0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	3611 requireNext(T.LParen);
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	3612 e = parseAssignExpression();
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	3613 require(T.RParen);
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	3614 e = new MixinExpression(e);
84 ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3615 break;
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3616 case T.Import:
86 0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	3617 requireNext(T.LParen);
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	3618 e = parseAssignExpression();
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	3619 require(T.RParen);
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	3620 e = new ImportExpression(e);
84 ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3621 break;
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3622 case T.Typeid:
86 0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	3623 requireNext(T.LParen);
99 6b8c248f5911 - Added member type to classes CastExpression and TypeidExpression. aziz parents: 98 diff changeset	3624 auto type = parseType();
6b8c248f5911 - Added member type to classes CastExpression and TypeidExpression. aziz parents: 98 diff changeset	3625 require(T.RParen);
6b8c248f5911 - Added member type to classes CastExpression and TypeidExpression. aziz parents: 98 diff changeset	3626 e = new TypeidExpression(type);
84 ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3627 break;
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3628 case T.Is:
100 538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	3629 requireNext(T.LParen);
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	3630
248 63a15b082c0c - Removed class SpecializationType. aziz parents: 247 diff changeset	3631 Type type, specType;
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	3632 Identifier* ident; // optional Identifier
248 63a15b082c0c - Removed class SpecializationType. aziz parents: 247 diff changeset	3633 Token* opTok, specTok;
100 538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	3634
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	3635 type = parseDeclarator(ident, true);
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	3636
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	3637 switch (token.type)
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	3638 {
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	3639 case T.Colon, T.Equal:
248 63a15b082c0c - Removed class SpecializationType. aziz parents: 247 diff changeset	3640 opTok = token;
100 538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	3641 nT();
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	3642 switch (token.type)
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	3643 {
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	3644 case T.Typedef,
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	3645 T.Struct,
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	3646 T.Union,
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	3647 T.Class,
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	3648 T.Interface,
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	3649 T.Enum,
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	3650 T.Function,
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	3651 T.Delegate,
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	3652 T.Super,
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	3653 T.Return:
493 d13502b6fa5f Added code to the Parser and edited main.wiki. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 492 diff changeset	3654 case_Const_Invariant:
248 63a15b082c0c - Removed class SpecializationType. aziz parents: 247 diff changeset	3655 specTok = token;
102 6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	3656 nT();
100 538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	3657 break;
493 d13502b6fa5f Added code to the Parser and edited main.wiki. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 492 diff changeset	3658 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	3659 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	3660 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	3661 // Fall through. It's a type.
100 538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	3662 default:
248 63a15b082c0c - Removed class SpecializationType. aziz parents: 247 diff changeset	3663 specType = parseType();
100 538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	3664 }
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	3665 default:
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	3666 }
377 906599374b69 - Added tparams member to IsExpression. aziz parents: 376 diff changeset	3667
906599374b69 - Added tparams member to IsExpression. aziz parents: 376 diff changeset	3668 TemplateParameters tparams;
906599374b69 - Added tparams member to IsExpression. aziz parents: 376 diff changeset	3669 version(D2)
906599374b69 - Added tparams member to IsExpression. aziz parents: 376 diff changeset	3670 {
906599374b69 - Added tparams member to IsExpression. aziz parents: 376 diff changeset	3671 // is ( Type Identifier : TypeSpecialization , TemplateParameterList )
906599374b69 - Added tparams member to IsExpression. aziz parents: 376 diff changeset	3672 // is ( Type Identifier == TypeSpecialization , TemplateParameterList )
906599374b69 - Added tparams member to IsExpression. aziz parents: 376 diff changeset	3673 if (ident && specType && token.type == T.Comma)
906599374b69 - Added tparams member to IsExpression. aziz parents: 376 diff changeset	3674 tparams = parseTemplateParameterList2();
906599374b69 - Added tparams member to IsExpression. aziz parents: 376 diff changeset	3675 }
102 6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	3676 require(T.RParen);
377 906599374b69 - Added tparams member to IsExpression. aziz parents: 376 diff changeset	3677 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	3678 break;
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3679 case T.LParen:
232 2a4e2c8ca094 - Renamed method isTemplateParameterList() to tokenAfterParenIs(). aziz parents: 231 diff changeset	3680 if (tokenAfterParenIs(T.LBrace))
130 0467f01ed524 - Fix: parameters can have optional identifier. aziz parents: 129 diff changeset	3681 {
232 2a4e2c8ca094 - Renamed method isTemplateParameterList() to tokenAfterParenIs(). aziz parents: 231 diff changeset	3682 auto parameters = parseParameterList();
143 e760d7552f66 - Renamed parseArgumentList() to parseArguments(). aziz parents: 141 diff changeset	3683 // ( ParameterList ) FunctionBody
267 f3dfa6208ed3 - Removed parameter func from parseFunctionBody(). Creating new FunctionBody inside the method. aziz parents: 266 diff changeset	3684 auto funcBody = parseFunctionBody();
289 a99357783c6f - Fix: assign targs to member targs of TraitsExpression. aziz parents: 288 diff changeset	3685 e = new FunctionLiteralExpression(null, parameters, funcBody);
130 0467f01ed524 - Fix: parameters can have optional identifier. aziz parents: 129 diff changeset	3686 }
0467f01ed524 - Fix: parameters can have optional identifier. aziz parents: 129 diff changeset	3687 else
0467f01ed524 - Fix: parameters can have optional identifier. aziz parents: 129 diff changeset	3688 {
131 ce636f3981cc - Removed TOK.Number. aziz parents: 130 diff changeset	3689 // ( Expression )
130 0467f01ed524 - Fix: parameters can have optional identifier. aziz parents: 129 diff changeset	3690 nT();
0467f01ed524 - Fix: parameters can have optional identifier. aziz parents: 129 diff changeset	3691 e = parseExpression();
0467f01ed524 - Fix: parameters can have optional identifier. aziz parents: 129 diff changeset	3692 require(T.RParen);
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3693 // TODO: create ParenExpression?
130 0467f01ed524 - Fix: parameters can have optional identifier. aziz parents: 129 diff changeset	3694 }
84 ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3695 break;
483 180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	3696 // IntegralType . Identifier
496 5a607597dc22 Improved error recovery in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 495 diff changeset	3697 case T.Char, T.Wchar, T.Dchar, T.Bool,
5a607597dc22 Improved error recovery in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 495 diff changeset	3698 T.Byte, T.Ubyte, T.Short, T.Ushort,
5a607597dc22 Improved error recovery in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 495 diff changeset	3699 T.Int, T.Uint, T.Long, T.Ulong,
94 0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	3700 T.Float, T.Double, T.Real,
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	3701 T.Ifloat, T.Idouble, T.Ireal,
192 5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	3702 T.Cfloat, T.Cdouble, T.Creal, T.Void:
280 1eb54f6f392e - Made class Type abstract. aziz parents: 272 diff changeset	3703 auto type = new IntegralType(token.type);
247 11a67ec83281 - Call set() on type variable. aziz parents: 246 diff changeset	3704 nT();
11a67ec83281 - Call set() on type variable. aziz parents: 246 diff changeset	3705 set(type, begin);
11a67ec83281 - Call set() on type variable. aziz parents: 246 diff changeset	3706 require(T.Dot);
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	3707 auto ident = requireIdentifier(MSG.ExpectedIdAfterTypeDot);
86 0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	3708
94 0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	3709 e = new TypeDotIdExpression(type, ident);
98 aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3710 break;
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3711 version(D2)
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3712 {
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3713 case T.Traits:
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3714 nT();
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3715 require(T.LParen);
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	3716 auto id = requireIdentifier(MSG.ExpectedAnIdentifier);
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3717 TemplateArguments args;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3718 if (token.type == T.Comma)
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3719 args = parseTemplateArguments2();
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3720 else
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3721 require(T.RParen);
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3722 e = new TraitsExpression(id, args);
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3723 break;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3724 }
84 ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3725 default:
343 95f1b6e43214 - Removed TOK.Special and added an own entry for each special token. aziz parents: 342 diff changeset	3726 if (token.isSpecialToken)
95f1b6e43214 - Removed TOK.Special and added an own entry for each special token. aziz parents: 342 diff changeset	3727 {
95f1b6e43214 - Removed TOK.Special and added an own entry for each special token. aziz parents: 342 diff changeset	3728 e = new SpecialTokenExpression(token);
95f1b6e43214 - Removed TOK.Special and added an own entry for each special token. aziz parents: 342 diff changeset	3729 nT();
95f1b6e43214 - Removed TOK.Special and added an own entry for each special token. aziz parents: 342 diff changeset	3730 break;
95f1b6e43214 - Removed TOK.Special and added an own entry for each special token. aziz parents: 342 diff changeset	3731 }
95f1b6e43214 - Removed TOK.Special and added an own entry for each special token. aziz parents: 342 diff changeset	3732
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	3733 error(MID.ExpectedButFound, "Expression", token.srcText);
136 96468715ea79 - Returning EmptyExpression in parsePrimaryExpression() when no token matched. aziz parents: 135 diff changeset	3734 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	3735 if (!trying)
9c69615a4876 Added method insertEmptyTokenBefore() to Lexer. Made some fixes, too. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 409 diff changeset	3736 {
9c69615a4876 Added method insertEmptyTokenBefore() to Lexer. Made some fixes, too. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 409 diff changeset	3737 // 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	3738 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	3739 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	3740 }
83 9e6d66f647c9 - Fix: IsExpression was created instead of IdentityExpression. aziz parents: 81 diff changeset	3741 }
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3742 set(e, begin);
83 9e6d66f647c9 - Fix: IsExpression was created instead of IdentityExpression. aziz parents: 81 diff changeset	3743 return e;
77 7e21c4df1c02 - Implemented parseMulExpression(). aziz parents: 76 diff changeset	3744 }
7e21c4df1c02 - Implemented parseMulExpression(). aziz parents: 76 diff changeset	3745
154 0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	3746 Expression parseNewExpression(/Expression e/)
81 aa1ea2548dd9 - Fixed parseExpression() method. aziz parents: 80 diff changeset	3747 {
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3748 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	3749 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	3750 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	3751
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon. aziz parents: 143 diff changeset	3752 Expression[] newArguments;
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon. aziz parents: 143 diff changeset	3753 Expression[] ctorArguments;
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon. aziz parents: 143 diff changeset	3754
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon. aziz parents: 143 diff changeset	3755 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	3756 newArguments = parseArguments();
144 cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon. aziz parents: 143 diff changeset	3757
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon. aziz parents: 143 diff changeset	3758 // NewAnonClassExpression:
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon. aziz parents: 143 diff changeset	3759 // 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	3760 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	3761 {
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon. aziz parents: 143 diff changeset	3762 nT();
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon. aziz parents: 143 diff changeset	3763 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	3764 ctorArguments = parseArguments();
144 cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon. aziz parents: 143 diff changeset	3765
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon. aziz parents: 143 diff changeset	3766 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	3767
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	3768 auto decls = parseDeclarationDefinitionsBody();
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3769 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	3770 }
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon. aziz parents: 143 diff changeset	3771
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon. aziz parents: 143 diff changeset	3772 // NewExpression:
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon. aziz parents: 143 diff changeset	3773 // NewArguments Type [ AssignExpression ]
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon. aziz parents: 143 diff changeset	3774 // NewArguments Type ( ArgumentList )
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon. aziz parents: 143 diff changeset	3775 // NewArguments Type
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon. aziz parents: 143 diff changeset	3776 auto type = parseType();
302 d04a79e795a2 - Fix in parseNewExpression(): removed check for type id. aziz parents: 301 diff changeset	3777
d04a79e795a2 - Fix in parseNewExpression(): removed check for type id. aziz parents: 301 diff changeset	3778 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	3779 ctorArguments = parseArguments();
302 d04a79e795a2 - Fix in parseNewExpression(): removed check for type id. aziz parents: 301 diff changeset	3780
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3781 return set(new NewExpression(/e, /newArguments, type, ctorArguments), begin);
81 aa1ea2548dd9 - Fixed parseExpression() method. aziz parents: 80 diff changeset	3782 }
aa1ea2548dd9 - Fixed parseExpression() method. aziz parents: 80 diff changeset	3783
98 aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3784 Type parseType()
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3785 {
104 b535016f8c3f - DeclaratorSuffix must be parsed after an Identifier. aziz parents: 103 diff changeset	3786 return parseBasicType2(parseBasicType());
98 aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3787 }
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3788
94 0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	3789 Type parseBasicType()
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	3790 {
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3791 auto begin = token;
94 0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	3792 Type t;
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	3793 // IdentifierType tident;
94 0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	3794
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	3795 switch (token.type)
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	3796 {
496 5a607597dc22 Improved error recovery in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 495 diff changeset	3797 case T.Char, T.Wchar, T.Dchar, T.Bool,
5a607597dc22 Improved error recovery in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 495 diff changeset	3798 T.Byte, T.Ubyte, T.Short, T.Ushort,
5a607597dc22 Improved error recovery in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 495 diff changeset	3799 T.Int, T.Uint, T.Long, T.Ulong,
94 0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	3800 T.Float, T.Double, T.Real,
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	3801 T.Ifloat, T.Idouble, T.Ireal,
192 5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	3802 T.Cfloat, T.Cdouble, T.Creal, T.Void:
280 1eb54f6f392e - Made class Type abstract. aziz parents: 272 diff changeset	3803 t = new IntegralType(token.type);
94 0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	3804 nT();
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3805 set(t, begin);
94 0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	3806 break;
153 66790fc2c0a2 - Added method parseIdentifierListType(). aziz parents: 152 diff changeset	3807 case T.Identifier, T.Typeof, T.Dot:
154 0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	3808 t = parseDotListType();
484 265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	3809 assert(!isNodeSet(t));
265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	3810 set(t, begin);
153 66790fc2c0a2 - Added method parseIdentifierListType(). aziz parents: 152 diff changeset	3811 break;
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3812 version(D2)
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3813 {
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3814 case T.Const:
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3815 // const ( Type )
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3816 nT();
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3817 require(T.LParen);
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3818 t = parseType();
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3819 require(T.RParen);
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3820 t = new ConstType(t);
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3821 set(t, begin);
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3822 break;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3823 case T.Invariant:
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3824 // invariant ( Type )
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3825 nT();
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3826 require(T.LParen);
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3827 t = parseType();
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3828 require(T.RParen);
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3829 t = new InvariantType(t);
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3830 set(t, begin);
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3831 break;
369 27767e203d64 - Added override attribute to ImportParser.start(). aziz parents: 368 diff changeset	3832 } // version(D2)
94 0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	3833 default:
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	3834 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	3835 t = new UndefinedType();
259 8118da6fee44 - Moved nT() below statement where an attribute class is constructed. aziz parents: 258 diff changeset	3836 nT();
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3837 set(t, begin);
94 0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	3838 }
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	3839 return t;
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	3840 }
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	3841
95 0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	3842 Type parseBasicType2(Type t)
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	3843 {
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3844 typeof(token) begin;
95 0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	3845 while (1)
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	3846 {
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3847 begin = token;
95 0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	3848 switch (token.type)
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	3849 {
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	3850 case T.Mul:
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	3851 t = new PointerType(t);
98 aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3852 nT();
95 0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	3853 break;
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	3854 case T.LBracket:
106 441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	3855 t = parseArrayType(t);
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3856 continue;
98 aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3857 case T.Function, T.Delegate:
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3858 TOK tok = token.type;
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3859 nT();
143 e760d7552f66 - Renamed parseArgumentList() to parseArguments(). aziz parents: 141 diff changeset	3860 auto parameters = parseParameterList();
135 145e0d68ec95 - Added enum TID to module Type. aziz parents: 134 diff changeset	3861 if (tok == T.Function)
291 c0e857931ff6 - Changed FunctionType and DelegateType. Both receive return type and parameters. aziz parents: 290 diff changeset	3862 t = new FunctionType(t, parameters);
135 145e0d68ec95 - Added enum TID to module Type. aziz parents: 134 diff changeset	3863 else
291 c0e857931ff6 - Changed FunctionType and DelegateType. Both receive return type and parameters. aziz parents: 290 diff changeset	3864 t = new DelegateType(t, parameters);
98 aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3865 break;
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3866 default:
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3867 return t;
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3868 }
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3869 set(t, begin);
98 aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3870 }
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3871 assert(0);
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3872 }
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3873
232 2a4e2c8ca094 - Renamed method isTemplateParameterList() to tokenAfterParenIs(). aziz parents: 231 diff changeset	3874 bool tokenAfterParenIs(TOK tok)
196 ea3f66901fa4 - Added code for parsing template parameter lists for functions. aziz parents: 195 diff changeset	3875 {
ea3f66901fa4 - Added code for parsing template parameter lists for functions. aziz parents: 195 diff changeset	3876 // 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	3877 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	3878 Token* next = token;
196 ea3f66901fa4 - Added code for parsing template parameter lists for functions. aziz parents: 195 diff changeset	3879 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	3880 Loop:
196 ea3f66901fa4 - Added code for parsing template parameter lists for functions. aziz parents: 195 diff changeset	3881 while (1)
ea3f66901fa4 - Added code for parsing template parameter lists for functions. aziz parents: 195 diff changeset	3882 {
232 2a4e2c8ca094 - Renamed method isTemplateParameterList() to tokenAfterParenIs(). aziz parents: 231 diff changeset	3883 lx.peek(next);
2a4e2c8ca094 - Renamed method isTemplateParameterList() to tokenAfterParenIs(). aziz parents: 231 diff changeset	3884 switch (next.type)
196 ea3f66901fa4 - Added code for parsing template parameter lists for functions. aziz parents: 195 diff changeset	3885 {
ea3f66901fa4 - Added code for parsing template parameter lists for functions. aziz parents: 195 diff changeset	3886 case T.RParen:
ea3f66901fa4 - Added code for parsing template parameter lists for functions. aziz parents: 195 diff changeset	3887 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	3888 { // 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	3889 do
cac9c8d637ad Fix: members related to error info weren't updated correctly. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 429 diff changeset	3890 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	3891 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	3892 break Loop;
196 ea3f66901fa4 - Added code for parsing template parameter lists for functions. aziz parents: 195 diff changeset	3893 }
434 cac9c8d637ad Fix: members related to error info weren't updated correctly. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 429 diff changeset	3894 break;
196 ea3f66901fa4 - Added code for parsing template parameter lists for functions. aziz parents: 195 diff changeset	3895 case T.LParen:
ea3f66901fa4 - Added code for parsing template parameter lists for functions. aziz parents: 195 diff changeset	3896 ++level;
434 cac9c8d637ad Fix: members related to error info weren't updated correctly. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 429 diff changeset	3897 break;
196 ea3f66901fa4 - Added code for parsing template parameter lists for functions. aziz parents: 195 diff changeset	3898 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	3899 break Loop;
196 ea3f66901fa4 - Added code for parsing template parameter lists for functions. aziz parents: 195 diff changeset	3900 default:
ea3f66901fa4 - Added code for parsing template parameter lists for functions. aziz parents: 195 diff changeset	3901 }
ea3f66901fa4 - Added code for parsing template parameter lists for functions. aziz parents: 195 diff changeset	3902 }
232 2a4e2c8ca094 - Renamed method isTemplateParameterList() to tokenAfterParenIs(). aziz parents: 231 diff changeset	3903 return next.type == tok;
196 ea3f66901fa4 - Added code for parsing template parameter lists for functions. aziz parents: 195 diff changeset	3904 }
ea3f66901fa4 - Added code for parsing template parameter lists for functions. aziz parents: 195 diff changeset	3905
98 aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3906 Type parseDeclaratorSuffix(Type t)
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3907 {
192 5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	3908 switch (token.type)
98 aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3909 {
192 5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	3910 case T.LBracket:
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	3911 // Type Identifier ArrayType
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	3912 // ArrayType := [] or [Type] or [Expression..Expression]
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	3913 do
106 441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	3914 t = parseArrayType(t);
192 5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	3915 while (token.type == T.LBracket)
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	3916 break;
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	3917 /+ // parsed in parseDeclaration()
192 5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	3918 case T.LParen:
258 112a57f433f2 - Created class TemplateParameters. aziz parents: 257 diff changeset	3919 TemplateParameters tparams;
232 2a4e2c8ca094 - Renamed method isTemplateParameterList() to tokenAfterParenIs(). aziz parents: 231 diff changeset	3920 if (tokenAfterParenIs(T.LParen))
196 ea3f66901fa4 - Added code for parsing template parameter lists for functions. aziz parents: 195 diff changeset	3921 {
ea3f66901fa4 - Added code for parsing template parameter lists for functions. aziz parents: 195 diff changeset	3922 // ( TemplateParameterList ) ( ParameterList )
ea3f66901fa4 - Added code for parsing template parameter lists for functions. aziz parents: 195 diff changeset	3923 tparams = parseTemplateParameterList();
ea3f66901fa4 - Added code for parsing template parameter lists for functions. aziz parents: 195 diff changeset	3924 }
ea3f66901fa4 - Added code for parsing template parameter lists for functions. aziz parents: 195 diff changeset	3925
192 5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	3926 auto params = parseParameterList();
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	3927 // ReturnType FunctionName ( ParameterList )
196 ea3f66901fa4 - Added code for parsing template parameter lists for functions. aziz parents: 195 diff changeset	3928 t = new FunctionType(t, params, tparams);
192 5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	3929 break;
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	3930 +/
192 5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	3931 default:
98 aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3932 break;
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3933 }
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3934 return t;
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3935 }
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3936
106 441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	3937 Type parseArrayType(Type t)
441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	3938 {
441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	3939 assert(token.type == T.LBracket);
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3940 auto begin = token;
106 441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	3941 nT();
441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	3942 if (token.type == T.RBracket)
441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	3943 {
441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	3944 t = new ArrayType(t);
441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	3945 nT();
441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	3946 }
441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	3947 else
441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	3948 {
214 45fc474c1678 - Changed 'failed' parameter of try_() to 'success'. aziz parents: 213 diff changeset	3949 bool success;
369 27767e203d64 - Added override attribute to ImportParser.start(). aziz parents: 368 diff changeset	3950 Type parseAAType()
27767e203d64 - Added override attribute to ImportParser.start(). aziz parents: 368 diff changeset	3951 {
27767e203d64 - Added override attribute to ImportParser.start(). aziz parents: 368 diff changeset	3952 auto type = parseType();
27767e203d64 - Added override attribute to ImportParser.start(). aziz parents: 368 diff changeset	3953 require(T.RBracket);
27767e203d64 - Added override attribute to ImportParser.start(). aziz parents: 368 diff changeset	3954 return type;
27767e203d64 - Added override attribute to ImportParser.start(). aziz parents: 368 diff changeset	3955 }
423 6057113f9a44 Refactored Parser.try_(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 422 diff changeset	3956 auto assocType = try_(&parseAAType, success);
214 45fc474c1678 - Changed 'failed' parameter of try_() to 'success'. aziz parents: 213 diff changeset	3957 if (success)
106 441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	3958 t = new ArrayType(t, assocType);
441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	3959 else
441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	3960 {
441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	3961 Expression e = parseExpression(), e2;
441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	3962 if (token.type == T.Slice)
441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	3963 {
441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	3964 nT();
441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	3965 e2 = parseExpression();
441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	3966 }
441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	3967 t = new ArrayType(t, e, e2);
369 27767e203d64 - Added override attribute to ImportParser.start(). aziz parents: 368 diff changeset	3968 require(T.RBracket);
106 441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	3969 }
441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	3970 }
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3971 set(t, begin);
106 441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	3972 return t;
441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	3973 }
441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	3974
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	3975 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	3976 {
38fccd2640eb Added code for parsing C function pointer declarations. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 406 diff changeset	3977 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	3978 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	3979 auto begin = token;
38fccd2640eb Added code for parsing C function pointer declarations. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 406 diff changeset	3980 nT(); // Skip (
38fccd2640eb Added code for parsing C function pointer declarations. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 406 diff changeset	3981 type = parseBasicType2(type);
38fccd2640eb Added code for parsing C function pointer declarations. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 406 diff changeset	3982 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	3983 {
38fccd2640eb Added code for parsing C function pointer declarations. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 406 diff changeset	3984 // Can be nested.
483 180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	3985 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	3986 }
38fccd2640eb Added code for parsing C function pointer declarations. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 406 diff changeset	3987 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	3988 {
38fccd2640eb Added code for parsing C function pointer declarations. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 406 diff changeset	3989 // 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	3990 ident = token.ident;
409 38fccd2640eb Added code for parsing C function pointer declarations. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 406 diff changeset	3991 nT();
38fccd2640eb Added code for parsing C function pointer declarations. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 406 diff changeset	3992 type = parseDeclaratorSuffix(type);
38fccd2640eb Added code for parsing C function pointer declarations. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 406 diff changeset	3993 }
38fccd2640eb Added code for parsing C function pointer declarations. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 406 diff changeset	3994 require(T.RParen);
483 180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	3995
180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	3996 Parameters params;
180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	3997 if (optionalParamList)
180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	3998 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	3999 else
180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	4000 params = parseParameterList();
180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	4001
409 38fccd2640eb Added code for parsing C function pointer declarations. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 406 diff changeset	4002 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	4003 return type;
38fccd2640eb Added code for parsing C function pointer declarations. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 406 diff changeset	4004 }
38fccd2640eb Added code for parsing C function pointer declarations. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 406 diff changeset	4005
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	4006 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	4007 {
104 b535016f8c3f - DeclaratorSuffix must be parsed after an Identifier. aziz parents: 103 diff changeset	4008 auto t = parseType();
98 aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	4009
409 38fccd2640eb Added code for parsing C function pointer declarations. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 406 diff changeset	4010 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	4011 {
483 180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	4012 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	4013 }
38fccd2640eb Added code for parsing C function pointer declarations. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 406 diff changeset	4014 else if (token.type == T.Identifier)
98 aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	4015 {
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	4016 ident = token.ident;
95 0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	4017 nT();
104 b535016f8c3f - DeclaratorSuffix must be parsed after an Identifier. aziz parents: 103 diff changeset	4018 t = parseDeclaratorSuffix(t);
95 0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	4019 }
409 38fccd2640eb Added code for parsing C function pointer declarations. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 406 diff changeset	4020
38fccd2640eb Added code for parsing C function pointer declarations. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 406 diff changeset	4021 if (ident is null && !identOptional)
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	4022 error(token, MSG.ExpectedDeclaratorIdentifier, token.srcText);
98 aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	4023
104 b535016f8c3f - DeclaratorSuffix must be parsed after an Identifier. aziz parents: 103 diff changeset	4024 return t;
95 0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	4025 }
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	4026
486 bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	4027 /++
bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	4028 Parse a list of AssignExpressions.
bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	4029 ExpressionList:
bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	4030 AssignExpression
bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	4031 AssignExpression , ExpressionList
bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	4032 +/
bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	4033 Expression[] parseExpressionList()
138 91b5187ed775 - Moved parseArgumentList() down a bit. aziz parents: 137 diff changeset	4034 {
486 bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	4035 Expression[] expressions;
bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	4036 while (1)
138 91b5187ed775 - Moved parseArgumentList() down a bit. aziz parents: 137 diff changeset	4037 {
486 bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	4038 expressions ~= parseAssignExpression();
bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	4039 if (token.type != T.Comma)
bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	4040 break;
138 91b5187ed775 - Moved parseArgumentList() down a bit. aziz parents: 137 diff changeset	4041 nT();
91b5187ed775 - Moved parseArgumentList() down a bit. aziz parents: 137 diff changeset	4042 }
486 bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	4043 return expressions;
bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	4044 }
bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	4045
bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	4046 /++
bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	4047 Arguments:
bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	4048 ( )
bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	4049 ( ExpressionList )
bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	4050 +/
bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	4051 Expression[] parseArguments()
bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	4052 {
bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	4053 assert(token.type == T.LParen);
bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	4054 nT();
bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	4055 Expression[] args;
bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	4056 if (token.type != TOK.RParen)
bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	4057 args = parseExpressionList();
bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	4058 require(TOK.RParen);
139 d48f345b05f8 - Implemented parseTemplateArgumentList(). aziz parents: 138 diff changeset	4059 return args;
138 91b5187ed775 - Moved parseArgumentList() down a bit. aziz parents: 137 diff changeset	4060 }
91b5187ed775 - Moved parseArgumentList() down a bit. aziz parents: 137 diff changeset	4061
143 e760d7552f66 - Renamed parseArgumentList() to parseArguments(). aziz parents: 141 diff changeset	4062 Parameters parseParameterList()
117 79857de26e86 - Moved class Parameter to module Types. Added struct Parameters. aziz parents: 116 diff changeset	4063 out(params)
96 d12d31d5fc17 - Added out-contract to parseParameters(). aziz parents: 95 diff changeset	4064 {
117 79857de26e86 - Moved class Parameter to module Types. Added struct Parameters. aziz parents: 116 diff changeset	4065 if (params.length > 1)
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters. aziz parents: 116 diff changeset	4066 foreach (param; params.items[0..$-1])
96 d12d31d5fc17 - Added out-contract to parseParameters(). aziz parents: 95 diff changeset	4067 {
117 79857de26e86 - Moved class Parameter to module Types. Added struct Parameters. aziz parents: 116 diff changeset	4068 if (param.isVariadic())
96 d12d31d5fc17 - Added out-contract to parseParameters(). aziz parents: 95 diff changeset	4069 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	4070 }
d12d31d5fc17 - Added out-contract to parseParameters(). aziz parents: 95 diff changeset	4071 }
d12d31d5fc17 - Added out-contract to parseParameters(). aziz parents: 95 diff changeset	4072 body
95 0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	4073 {
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	4074 auto begin = token;
95 0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	4075 require(T.LParen);
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	4076
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	4077 auto params = new Parameters();
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	4078
95 0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	4079 if (token.type == T.RParen)
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	4080 {
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	4081 nT();
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	4082 return set(params, begin);
95 0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	4083 }
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	4084
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	4085 Loop:
95 0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	4086 while (1)
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	4087 {
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	4088 auto paramBegin = token;
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4089 StorageClass stc, tmp;
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	4090 Type type;
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	4091 Identifier* ident;
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	4092 Expression defValue;
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	4093
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	4094 void pushParameter()
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	4095 {
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	4096 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	4097 }
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4098
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4099 if (token.type == T.Ellipses)
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4100 {
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4101 nT();
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	4102 stc = StorageClass.Variadic;
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	4103 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	4104 break Loop;
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4105 }
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4106
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4107 Lstc_loop:
95 0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	4108 switch (token.type)
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	4109 {
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	4110 version(D2)
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	4111 {
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4112 case T.Invariant: // D2.0
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4113 if (peekNext() == T.LParen)
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4114 goto default;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4115 tmp = StorageClass.Invariant;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4116 goto Lcommon;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4117 case T.Const: // D2.0
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4118 if (peekNext() == T.LParen)
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4119 goto default;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4120 tmp = StorageClass.Const;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4121 goto Lcommon;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4122 case T.Final: // D2.0
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4123 tmp = StorageClass.Final;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4124 goto Lcommon;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4125 case T.Scope: // D2.0
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4126 tmp = StorageClass.Scope;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4127 goto Lcommon;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4128 case T.Static: // D2.0
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4129 tmp = StorageClass.Static;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4130 goto Lcommon;
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	4131 }
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4132 case T.In:
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4133 tmp = StorageClass.In;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4134 goto Lcommon;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4135 case T.Out:
282 74113a9aa77c - Fix: assigned wrong StorageClass to variable. aziz parents: 280 diff changeset	4136 tmp = StorageClass.Out;
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4137 goto Lcommon;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4138 case T.Inout, T.Ref:
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4139 tmp = StorageClass.Ref;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4140 goto Lcommon;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4141 case T.Lazy:
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4142 tmp = StorageClass.Lazy;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4143 goto Lcommon;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4144 Lcommon:
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	4145 // Check for redundancy.
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4146 if (stc & tmp)
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4147 error(MID.RedundantStorageClass, token.srcText);
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4148 else
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4149 stc \|= tmp;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4150 nT();
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	4151 version(D2)
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4152 goto Lstc_loop;
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	4153 else
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	4154 goto default; // In D1.0 only one stc per parameter is allowed.
95 0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	4155 default:
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	4156 type = parseDeclarator(ident, true);
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	4157
95 0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	4158 if (token.type == T.Assign)
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	4159 nT(), (defValue = parseAssignExpression());
95 0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	4160
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	4161 if (token.type == T.Ellipses)
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	4162 {
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	4163 nT();
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	4164 stc \|= StorageClass.Variadic;
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	4165 pushParameter();
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	4166 break Loop;
95 0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	4167 }
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	4168
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	4169 pushParameter();
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	4170
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	4171 if (token.type != T.Comma)
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	4172 break Loop;
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	4173 nT();
95 0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	4174 }
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	4175 }
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	4176 require(T.RParen);
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	4177 return set(params, begin);
95 0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	4178 }
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	4179
150 753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	4180 TemplateArguments parseTemplateArguments()
139 d48f345b05f8 - Implemented parseTemplateArgumentList(). aziz parents: 138 diff changeset	4181 {
376 5ebe80ce84f2 - Separated common code to parseTemplateArguments_(). aziz parents: 375 diff changeset	4182 TemplateArguments targs;
139 d48f345b05f8 - Implemented parseTemplateArgumentList(). aziz parents: 138 diff changeset	4183 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	4184 if (token.type != T.RParen)
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	4185 targs = parseTemplateArguments_();
139 d48f345b05f8 - Implemented parseTemplateArgumentList(). aziz parents: 138 diff changeset	4186 require(T.RParen);
376 5ebe80ce84f2 - Separated common code to parseTemplateArguments_(). aziz parents: 375 diff changeset	4187 return targs;
139 d48f345b05f8 - Implemented parseTemplateArgumentList(). aziz parents: 138 diff changeset	4188 }
376 5ebe80ce84f2 - Separated common code to parseTemplateArguments_(). aziz parents: 375 diff changeset	4189
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4190 version(D2)
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4191 {
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4192 TemplateArguments parseTemplateArguments2()
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4193 {
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4194 assert(token.type == T.Comma);
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4195 nT();
376 5ebe80ce84f2 - Separated common code to parseTemplateArguments_(). aziz parents: 375 diff changeset	4196 TemplateArguments targs;
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4197 if (token.type != T.RParen)
376 5ebe80ce84f2 - Separated common code to parseTemplateArguments_(). aziz parents: 375 diff changeset	4198 targs = parseTemplateArguments_();
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4199 else
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	4200 error(token, MSG.ExpectedTypeOrExpression);
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4201 require(T.RParen);
376 5ebe80ce84f2 - Separated common code to parseTemplateArguments_(). aziz parents: 375 diff changeset	4202 return targs;
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4203 }
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4204 } // version(D2)
376 5ebe80ce84f2 - Separated common code to parseTemplateArguments_(). aziz parents: 375 diff changeset	4205
5ebe80ce84f2 - Separated common code to parseTemplateArguments_(). aziz parents: 375 diff changeset	4206 TemplateArguments parseTemplateArguments_()
5ebe80ce84f2 - Separated common code to parseTemplateArguments_(). aziz parents: 375 diff changeset	4207 {
5ebe80ce84f2 - Separated common code to parseTemplateArguments_(). aziz parents: 375 diff changeset	4208 auto begin = token;
5ebe80ce84f2 - Separated common code to parseTemplateArguments_(). aziz parents: 375 diff changeset	4209 auto targs = new TemplateArguments;
5ebe80ce84f2 - Separated common code to parseTemplateArguments_(). aziz parents: 375 diff changeset	4210 while (1)
5ebe80ce84f2 - Separated common code to parseTemplateArguments_(). aziz parents: 375 diff changeset	4211 {
379 a92f7826a4fa - Fix in parseTemplateArguments_(): calling nested parseType_() instead of parseType() in try_(). aziz parents: 377 diff changeset	4212 Type parseType_()
a92f7826a4fa - Fix in parseTemplateArguments_(): calling nested parseType_() instead of parseType() in try_(). aziz parents: 377 diff changeset	4213 {
a92f7826a4fa - Fix in parseTemplateArguments_(): calling nested parseType_() instead of parseType() in try_(). aziz parents: 377 diff changeset	4214 auto type = parseType();
a92f7826a4fa - Fix in parseTemplateArguments_(): calling nested parseType_() instead of parseType() in try_(). aziz parents: 377 diff changeset	4215 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	4216 return type;
a92f7826a4fa - Fix in parseTemplateArguments_(): calling nested parseType_() instead of parseType() in try_(). aziz parents: 377 diff changeset	4217 ++errorCount; // Cause try_() to fail.
a92f7826a4fa - Fix in parseTemplateArguments_(): calling nested parseType_() instead of parseType() in try_(). aziz parents: 377 diff changeset	4218 return null;
a92f7826a4fa - Fix in parseTemplateArguments_(): calling nested parseType_() instead of parseType() in try_(). aziz parents: 377 diff changeset	4219 }
376 5ebe80ce84f2 - Separated common code to parseTemplateArguments_(). aziz parents: 375 diff changeset	4220 bool success;
423 6057113f9a44 Refactored Parser.try_(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 422 diff changeset	4221 auto typeArgument = try_(&parseType_, success);
376 5ebe80ce84f2 - Separated common code to parseTemplateArguments_(). aziz parents: 375 diff changeset	4222 if (success)
5ebe80ce84f2 - Separated common code to parseTemplateArguments_(). aziz parents: 375 diff changeset	4223 // TemplateArgument:
5ebe80ce84f2 - Separated common code to parseTemplateArguments_(). aziz parents: 375 diff changeset	4224 // Type
5ebe80ce84f2 - Separated common code to parseTemplateArguments_(). aziz parents: 375 diff changeset	4225 // Symbol
5ebe80ce84f2 - Separated common code to parseTemplateArguments_(). aziz parents: 375 diff changeset	4226 targs ~= typeArgument;
5ebe80ce84f2 - Separated common code to parseTemplateArguments_(). aziz parents: 375 diff changeset	4227 else
5ebe80ce84f2 - Separated common code to parseTemplateArguments_(). aziz parents: 375 diff changeset	4228 // TemplateArgument:
5ebe80ce84f2 - Separated common code to parseTemplateArguments_(). aziz parents: 375 diff changeset	4229 // AssignExpression
5ebe80ce84f2 - Separated common code to parseTemplateArguments_(). aziz parents: 375 diff changeset	4230 targs ~= parseAssignExpression();
5ebe80ce84f2 - Separated common code to parseTemplateArguments_(). aziz parents: 375 diff changeset	4231 if (token.type != T.Comma)
5ebe80ce84f2 - Separated common code to parseTemplateArguments_(). aziz parents: 375 diff changeset	4232 break; // Exit loop.
5ebe80ce84f2 - Separated common code to parseTemplateArguments_(). aziz parents: 375 diff changeset	4233 nT();
5ebe80ce84f2 - Separated common code to parseTemplateArguments_(). aziz parents: 375 diff changeset	4234 }
5ebe80ce84f2 - Separated common code to parseTemplateArguments_(). aziz parents: 375 diff changeset	4235 set(targs, begin);
5ebe80ce84f2 - Separated common code to parseTemplateArguments_(). aziz parents: 375 diff changeset	4236 return targs;
5ebe80ce84f2 - Separated common code to parseTemplateArguments_(). aziz parents: 375 diff changeset	4237 }
5ebe80ce84f2 - Separated common code to parseTemplateArguments_(). aziz parents: 375 diff changeset	4238
258 112a57f433f2 - Created class TemplateParameters. aziz parents: 257 diff changeset	4239 TemplateParameters parseTemplateParameterList()
137 b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4240 {
377 906599374b69 - Added tparams member to IsExpression. aziz parents: 376 diff changeset	4241 TemplateParameters tparams;
906599374b69 - Added tparams member to IsExpression. aziz parents: 376 diff changeset	4242 require(T.LParen);
906599374b69 - Added tparams member to IsExpression. aziz parents: 376 diff changeset	4243 if (token.type != T.RParen)
906599374b69 - Added tparams member to IsExpression. aziz parents: 376 diff changeset	4244 tparams = parseTemplateParameterList_();
906599374b69 - Added tparams member to IsExpression. aziz parents: 376 diff changeset	4245 require(T.RParen);
906599374b69 - Added tparams member to IsExpression. aziz parents: 376 diff changeset	4246 return tparams;
906599374b69 - Added tparams member to IsExpression. aziz parents: 376 diff changeset	4247 }
906599374b69 - Added tparams member to IsExpression. aziz parents: 376 diff changeset	4248
906599374b69 - Added tparams member to IsExpression. aziz parents: 376 diff changeset	4249 version(D2)
906599374b69 - Added tparams member to IsExpression. aziz parents: 376 diff changeset	4250 {
906599374b69 - Added tparams member to IsExpression. aziz parents: 376 diff changeset	4251 TemplateParameters parseTemplateParameterList2()
906599374b69 - Added tparams member to IsExpression. aziz parents: 376 diff changeset	4252 {
906599374b69 - Added tparams member to IsExpression. aziz parents: 376 diff changeset	4253 assert(token.type == T.Comma);
906599374b69 - Added tparams member to IsExpression. aziz parents: 376 diff changeset	4254 nT();
906599374b69 - Added tparams member to IsExpression. aziz parents: 376 diff changeset	4255 TemplateParameters tparams;
906599374b69 - Added tparams member to IsExpression. aziz parents: 376 diff changeset	4256 if (token.type != T.RParen)
906599374b69 - Added tparams member to IsExpression. aziz parents: 376 diff changeset	4257 tparams = parseTemplateParameterList_();
906599374b69 - Added tparams member to IsExpression. aziz parents: 376 diff changeset	4258 else
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	4259 error(token, MSG.ExpectedTemplateParameters);
377 906599374b69 - Added tparams member to IsExpression. aziz parents: 376 diff changeset	4260 return tparams;
906599374b69 - Added tparams member to IsExpression. aziz parents: 376 diff changeset	4261 }
906599374b69 - Added tparams member to IsExpression. aziz parents: 376 diff changeset	4262 } // version(D2)
906599374b69 - Added tparams member to IsExpression. aziz parents: 376 diff changeset	4263
906599374b69 - Added tparams member to IsExpression. aziz parents: 376 diff changeset	4264 TemplateParameters parseTemplateParameterList_()
906599374b69 - Added tparams member to IsExpression. aziz parents: 376 diff changeset	4265 {
258 112a57f433f2 - Created class TemplateParameters. aziz parents: 257 diff changeset	4266 auto begin = token;
295 75b47c71a34c - Assigning to Node.children in several constructors that inherit from Node. aziz parents: 293 diff changeset	4267 auto tparams = new TemplateParameters;
75b47c71a34c - Assigning to Node.children in several constructors that inherit from Node. aziz parents: 293 diff changeset	4268
137 b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4269 while (1)
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4270 {
258 112a57f433f2 - Created class TemplateParameters. aziz parents: 257 diff changeset	4271 auto paramBegin = token;
340 1accb3013bd2 - Changed class TemplateParameter to an abstract class. aziz parents: 335 diff changeset	4272 TemplateParameter tp;
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	4273 Identifier* ident;
137 b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4274 Type specType, defType;
340 1accb3013bd2 - Changed class TemplateParameter to an abstract class. aziz parents: 335 diff changeset	4275
1accb3013bd2 - Changed class TemplateParameter to an abstract class. aziz parents: 335 diff changeset	4276 void parseSpecAndOrDefaultType()
137 b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4277 {
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4278 // : SpecializationType
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4279 if (token.type == T.Colon)
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4280 {
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4281 nT();
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4282 specType = parseType();
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4283 }
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4284 // = DefaultType
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4285 if (token.type == T.Assign)
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4286 {
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4287 nT();
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4288 defType = parseType();
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4289 }
340 1accb3013bd2 - Changed class TemplateParameter to an abstract class. aziz parents: 335 diff changeset	4290 }
1accb3013bd2 - Changed class TemplateParameter to an abstract class. aziz parents: 335 diff changeset	4291
1accb3013bd2 - Changed class TemplateParameter to an abstract class. aziz parents: 335 diff changeset	4292 switch (token.type)
1accb3013bd2 - Changed class TemplateParameter to an abstract class. aziz parents: 335 diff changeset	4293 {
1accb3013bd2 - Changed class TemplateParameter to an abstract class. aziz parents: 335 diff changeset	4294 case T.Alias:
1accb3013bd2 - Changed class TemplateParameter to an abstract class. aziz parents: 335 diff changeset	4295 // TemplateAliasParameter:
1accb3013bd2 - Changed class TemplateParameter to an abstract class. aziz parents: 335 diff changeset	4296 // alias Identifier
1accb3013bd2 - Changed class TemplateParameter to an abstract class. aziz parents: 335 diff changeset	4297 nT(); // Skip alias keyword.
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	4298 ident = requireIdentifier(MSG.ExpectedAliasTemplateParam);
340 1accb3013bd2 - Changed class TemplateParameter to an abstract class. aziz parents: 335 diff changeset	4299 parseSpecAndOrDefaultType();
1accb3013bd2 - Changed class TemplateParameter to an abstract class. aziz parents: 335 diff changeset	4300 tp = new TemplateAliasParameter(ident, specType, defType);
137 b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4301 break;
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4302 case T.Identifier:
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	4303 ident = token.ident;
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	4304 switch (peekNext())
137 b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4305 {
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4306 case T.Ellipses:
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4307 // TemplateTupleParameter:
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4308 // Identifier ...
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4309 nT(); // Skip Identifier.
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4310 nT(); // Skip Ellipses.
341 3ac651ea83fb - Fix: created TemplateAliasParameter instead of TemplateTypeParameter. aziz parents: 340 diff changeset	4311 if (token.type == T.Comma)
342 f13d551d7c4f - Added error messages MID.InContract and MID.OutContract. aziz parents: 341 diff changeset	4312 error(MID.TemplateTupleParameter);
340 1accb3013bd2 - Changed class TemplateParameter to an abstract class. aziz parents: 335 diff changeset	4313 tp = new TemplateTupleParameter(ident);
137 b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4314 break;
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4315 case T.Comma, T.RParen, T.Colon, T.Assign:
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4316 // TemplateTypeParameter:
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4317 // Identifier
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4318 nT(); // Skip Identifier.
340 1accb3013bd2 - Changed class TemplateParameter to an abstract class. aziz parents: 335 diff changeset	4319 parseSpecAndOrDefaultType();
341 3ac651ea83fb - Fix: created TemplateAliasParameter instead of TemplateTypeParameter. aziz parents: 340 diff changeset	4320 tp = new TemplateTypeParameter(ident, specType, defType);
137 b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4321 break;
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4322 default:
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4323 // TemplateValueParameter:
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4324 // Declarator
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4325 ident = null;
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4326 goto LTemplateValueParameter;
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4327 }
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4328 break;
492 9c208925a3d4 Added module ImportParser and new stuff from DMD2.008. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 491 diff changeset	4329 version(D2)
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 491 diff changeset	4330 {
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 491 diff changeset	4331 case T.This:
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 491 diff changeset	4332 // TemplateThisParameter
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 491 diff changeset	4333 // this TemplateTypeParameter
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 491 diff changeset	4334 nT(); // Skip 'this' keyword.
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	4335 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	4336 parseSpecAndOrDefaultType();
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 491 diff changeset	4337 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	4338 break;
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 491 diff changeset	4339 }
137 b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4340 default:
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4341 LTemplateValueParameter:
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4342 // TemplateValueParameter:
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4343 // Declarator
340 1accb3013bd2 - Changed class TemplateParameter to an abstract class. aziz parents: 335 diff changeset	4344 Expression specValue, defValue;
1accb3013bd2 - Changed class TemplateParameter to an abstract class. aziz parents: 335 diff changeset	4345 auto valueType = parseDeclarator(ident);
137 b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4346 // : SpecializationValue
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4347 if (token.type == T.Colon)
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4348 {
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4349 nT();
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4350 specValue = parseCondExpression();
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4351 }
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4352 // = DefaultValue
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4353 if (token.type == T.Assign)
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4354 {
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4355 nT();
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4356 defValue = parseCondExpression();
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4357 }
340 1accb3013bd2 - Changed class TemplateParameter to an abstract class. aziz parents: 335 diff changeset	4358 tp = new TemplateValueParameter(valueType, ident, specValue, defValue);
137 b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4359 }
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4360
340 1accb3013bd2 - Changed class TemplateParameter to an abstract class. aziz parents: 335 diff changeset	4361 // Push template parameter.
1accb3013bd2 - Changed class TemplateParameter to an abstract class. aziz parents: 335 diff changeset	4362 tparams ~= set(tp, paramBegin);
137 b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4363
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4364 if (token.type != T.Comma)
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4365 break;
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4366 nT();
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4367 }
258 112a57f433f2 - Created class TemplateParameters. aziz parents: 257 diff changeset	4368 set(tparams, begin);
137 b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4369 return tparams;
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4370 }
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4371
124 d4c4cea6ee7f - Renamed method errorIfNot() to expected(). aziz parents: 123 diff changeset	4372 void expected(TOK tok)
86 0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	4373 {
87 c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	4374 if (token.type != tok)
327 a48a987f7515 - Added package dil to import declarations. aziz parents: 326 diff changeset	4375 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	4376 }
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	4377
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	4378 void require(TOK tok)
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	4379 {
87 c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	4380 if (token.type == tok)
86 0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	4381 nT();
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	4382 else
327 a48a987f7515 - Added package dil to import declarations. aziz parents: 326 diff changeset	4383 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	4384 }
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	4385
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	4386 void requireNext(TOK tok)
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	4387 {
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	4388 nT();
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	4389 require(tok);
86 0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	4390 }
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	4391
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	4392 Identifier* optionalIdentifier()
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	4393 {
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	4394 Identifier* id;
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	4395 if (token.type == T.Identifier)
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	4396 (id = token.ident), nT();
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	4397 return id;
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	4398 }
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	4399
504 9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 502 diff changeset	4400 Identifier* requireIdentifier()
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 502 diff changeset	4401 {
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 502 diff changeset	4402 Identifier* id;
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 502 diff changeset	4403 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	4404 (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	4405 else
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 502 diff changeset	4406 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	4407 return id;
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 502 diff changeset	4408 }
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 502 diff changeset	4409
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 502 diff changeset	4410 /++
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 502 diff changeset	4411 Params:
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 502 diff changeset	4412 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	4413 +/
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 502 diff changeset	4414 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	4415 {
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 502 diff changeset	4416 Identifier* id;
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 502 diff changeset	4417 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	4418 (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	4419 else
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 502 diff changeset	4420 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	4421 return id;
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 502 diff changeset	4422 }
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 502 diff changeset	4423
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 502 diff changeset	4424 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	4425 {
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 502 diff changeset	4426 Identifier* id;
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 502 diff changeset	4427 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	4428 (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	4429 else
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 502 diff changeset	4430 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	4431 return id;
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 502 diff changeset	4432 }
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 502 diff changeset	4433
243 461e544ebb53 - Added method requireId(). aziz parents: 242 diff changeset	4434 Token* requireId()
461e544ebb53 - Added method requireId(). aziz parents: 242 diff changeset	4435 {
461e544ebb53 - Added method requireId(). aziz parents: 242 diff changeset	4436 if (token.type == T.Identifier)
461e544ebb53 - Added method requireId(). aziz parents: 242 diff changeset	4437 {
461e544ebb53 - Added method requireId(). aziz parents: 242 diff changeset	4438 auto id = token;
461e544ebb53 - Added method requireId(). aziz parents: 242 diff changeset	4439 nT();
461e544ebb53 - Added method requireId(). aziz parents: 242 diff changeset	4440 return id;
461e544ebb53 - Added method requireId(). aziz parents: 242 diff changeset	4441 }
461e544ebb53 - Added method requireId(). aziz parents: 242 diff changeset	4442 else
461e544ebb53 - Added method requireId(). aziz parents: 242 diff changeset	4443 error(MID.ExpectedButFound, "Identifier", token.srcText);
461e544ebb53 - Added method requireId(). aziz parents: 242 diff changeset	4444 return null;
461e544ebb53 - Added method requireId(). aziz parents: 242 diff changeset	4445 }
461e544ebb53 - Added method requireId(). aziz parents: 242 diff changeset	4446
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	4447 Token* requireIdToken(char[] errorMsg)
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	4448 {
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	4449 Token* idtok;
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	4450 if (token.type == T.Identifier)
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	4451 (idtok = token), nT();
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	4452 else
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	4453 error(token, errorMsg, token.srcText);
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	4454 return idtok;
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	4455 }
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	4456
496 5a607597dc22 Improved error recovery in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 495 diff changeset	4457 /// 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	4458 void error(Token* token, char[] formatMsg, ...)
5a607597dc22 Improved error recovery in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 495 diff changeset	4459 {
5a607597dc22 Improved error recovery in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 495 diff changeset	4460 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	4461 }
5a607597dc22 Improved error recovery in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 495 diff changeset	4462
391 33b566df6af4 Migrated project to Tango. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 379 diff changeset	4463 void error(MID mid, ...)
71 b3777cca323c - Added Identity and NotIdentity tokens. aziz parents: 70 diff changeset	4464 {
496 5a607597dc22 Improved error recovery in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 495 diff changeset	4465 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	4466 }
5a607597dc22 Improved error recovery in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 495 diff changeset	4467
5a607597dc22 Improved error recovery in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 495 diff changeset	4468 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	4469 {
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	4470 if (trying)
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	4471 {
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	4472 ++errorCount;
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	4473 return;
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	4474 }
496 5a607597dc22 Improved error recovery in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 495 diff changeset	4475 auto location = token.getLocation();
5a607597dc22 Improved error recovery in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 495 diff changeset	4476 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	4477 errors ~= new Information(InfoType.Parser, mid, location, msg);
71 b3777cca323c - Added Identity and NotIdentity tokens. aziz parents: 70 diff changeset	4478 }
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	4479
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	4480 /// 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	4481 private struct MSG
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	4482 {
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	4483 static:
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	4484 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	4485 auto ExpectedModuleIdentifier = "expected module identifier, not '{}'";
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	4486 auto IllegalDeclaration = "illegal Declaration found: {}";
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	4487 auto ExpectedFunctionName = "expected function name, not '{}'";
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	4488 auto ExpectedVariableName = "expected variable name, not '{}'";
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	4489 auto ExpectedFunctionBody = "expected function body, not '{}'";
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	4490 auto RedundantLinkageType = "redundant linkage type: ";
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	4491 auto ExpectedPragmaIdentifier = "expected pragma identifier, not '{}'";
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	4492 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	4493 auto ExpectedAliasImportName = "expected alias name, not '{}'";
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	4494 auto ExpectedImportName = "expected an identifier, not '{}'";
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	4495 auto ExpectedEnumMember = "expected enum member, not '{}'";
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	4496 auto ExpectedEnumBody = "expected enum body, not '{}'";
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	4497 auto ExpectedClassName = "expected class name, not '{}'";
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	4498 auto ExpectedClassBody = "expected class body, not '{}'";
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	4499 auto ExpectedInterfaceName = "expected interface name, not '{}'";
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	4500 auto ExpectedInterfaceBody = "expected interface body, not '{}'";
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	4501 auto ExpectedTemplateName = "expected template name, not '{}'";
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	4502 auto ExpectedAnIdentifier = "expected an identifier, not '{}'";
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	4503 auto IllegalStatement = "illegal Statement found: ";
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	4504 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	4505 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	4506 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	4507 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	4508 auto IllegalAsmInstructino = "illegal AsmInstruction found: ";
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	4509 auto ExpectedDeclaratorIdentifier = "expected declarator identifier, not '{}'";
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	4510 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	4511 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	4512 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	4513 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	4514 }
65 6c21ae79fbb3 - Renamed function Token.span to Token.srcText. aziz parents: 0 diff changeset	4515 }

Mercurial > projects > dil

annotate trunk/src/dil/Parser.d @ 505:3bb94ba21490