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

annotate trunk/src/dil/Parser.d @ 485:ea8c7459f1c4

Changed a lot of things in the Lexer. Newlines are tokenized now, instead of being treated as whitespace. Newline tokens store location info as well, which make quite a few functions unnecessary. Added a static method getLocation() which returns a Location instance for any given token. This will also be very useful for finding the location of AST nodes (through Node.begin,) which is needed for reporting parser and semantic errors and emitting documentation. Removed rescanNewlines(), LocState, getState(), restoreState(), evaluateHashLine() and updateErrorLoc(). Added isUnicodeNewlineChar(), isUnicodeNewline(), isNewline(), isNewlineEnd(), isEndOfLine(), scanNewline(), getLocation() and error_(). Replaced some clunky expressions with isascii(), isNewlineEnd(), isEndOfLine(), isUnicodeNewline(), isUnicodeNewlineChar(). Fix in scanNormalStringLiteral(): scanPostfix() must be before label Lreturn. Fixed Lexer unittest. Fix in parseDeclarationDefinitionsBlock(): 'token' should be 'begin'. Added method isMultiline() to Token and added documentation comments.: File name too long abort: file /home/aziz/dil/trunk/Changed a lot of things in the Lexer. Newlines are tokenized now, instead of being treated as whitespace. Newline tokens store location info as well, which make quite a few functions unnecessary. Added a static method getLocation() which returns a Location instance for any given token. This will also be very useful for finding the location of AST nodes (through Node.begin,) which is needed for reporting parser and semantic errors and emitting documentation. Removed rescanNewlines(), LocState, getState(), restoreState(), evaluateHashLine() and updateErrorLoc(). Added isUnicodeNewlineChar(), isUnicodeNewline(), isNewline(), isNewlineEnd(), isEndOfLine(), scanNewline(), getLocation() and error_(). Replaced some clunky expressions with isascii(), isNewlineEnd(), isEndOfLine(), isUnicodeNewline(), isUnicodeNewlineChar(). Fix in scanNormalStringLiteral(): scanPostfix() must be before label Lreturn. Fixed Lexer unittest. Fix in parseDeclarationDefinitionsBlock(): 'token' should be 'begin'. Added method isMultiline() to Token and added documentation comments.

author	Aziz K?ksal <aziz.koeksal@gmail.com>
date	Fri, 30 Nov 2007 20:17:29 +0100
parents	265c0b655f18
children	bd176bc73e43

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;
391 33b566df6af4 Migrated project to Tango. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 379 diff changeset	15 import common;
65 6c21ae79fbb3 - Renamed function Token.span to Token.srcText. aziz parents: 0 diff changeset	16
71 b3777cca323c - Added Identity and NotIdentity tokens. aziz parents: 70 diff changeset	17 private alias TOK T;
b3777cca323c - Added Identity and NotIdentity tokens. aziz parents: 70 diff changeset	18
368 2adf808343d6 - Renamed method start() to init() in Parser. aziz parents: 367 diff changeset	19 class ImportParser : Parser
2adf808343d6 - Renamed method start() to init() in Parser. aziz parents: 367 diff changeset	20 {
2adf808343d6 - Renamed method start() to init() in Parser. aziz parents: 367 diff changeset	21 this(char[] srcText, string fileName)
2adf808343d6 - Renamed method start() to init() in Parser. aziz parents: 367 diff changeset	22 {
2adf808343d6 - Renamed method start() to init() in Parser. aziz parents: 367 diff changeset	23 super(srcText, fileName);
2adf808343d6 - Renamed method start() to init() in Parser. aziz parents: 367 diff changeset	24 }
2adf808343d6 - Renamed method start() to init() in Parser. aziz parents: 367 diff changeset	25
369 27767e203d64 - Added override attribute to ImportParser.start(). aziz parents: 368 diff changeset	26 override Declarations start()
368 2adf808343d6 - Renamed method start() to init() in Parser. aziz parents: 367 diff changeset	27 {
2adf808343d6 - Renamed method start() to init() in Parser. aziz parents: 367 diff changeset	28 auto decls = new Declarations;
2adf808343d6 - Renamed method start() to init() in Parser. aziz parents: 367 diff changeset	29 super.init();
2adf808343d6 - Renamed method start() to init() in Parser. aziz parents: 367 diff changeset	30 if (token.type == T.Module)
2adf808343d6 - Renamed method start() to init() in Parser. aziz parents: 367 diff changeset	31 decls ~= parseModuleDeclaration();
2adf808343d6 - Renamed method start() to init() in Parser. aziz parents: 367 diff changeset	32 while (token.type != T.EOF)
2adf808343d6 - Renamed method start() to init() in Parser. aziz parents: 367 diff changeset	33 {
2adf808343d6 - Renamed method start() to init() in Parser. aziz parents: 367 diff changeset	34 if (token.type == T.Import)
2adf808343d6 - Renamed method start() to init() in Parser. aziz parents: 367 diff changeset	35 {
2adf808343d6 - Renamed method start() to init() in Parser. aziz parents: 367 diff changeset	36 auto decl = parseImportDeclaration();
2adf808343d6 - Renamed method start() to init() in Parser. aziz parents: 367 diff changeset	37 assert(decl && decl.kind == NodeKind.ImportDeclaration);
2adf808343d6 - Renamed method start() to init() in Parser. aziz parents: 367 diff changeset	38 super.imports ~= cast(ImportDeclaration)cast(void*)decl;
2adf808343d6 - Renamed method start() to init() in Parser. aziz parents: 367 diff changeset	39 decls ~= decl;
2adf808343d6 - Renamed method start() to init() in Parser. aziz parents: 367 diff changeset	40 }
2adf808343d6 - Renamed method start() to init() in Parser. aziz parents: 367 diff changeset	41 else
2adf808343d6 - Renamed method start() to init() in Parser. aziz parents: 367 diff changeset	42 nT();
2adf808343d6 - Renamed method start() to init() in Parser. aziz parents: 367 diff changeset	43 }
2adf808343d6 - Renamed method start() to init() in Parser. aziz parents: 367 diff changeset	44 return decls;
2adf808343d6 - Renamed method start() to init() in Parser. aziz parents: 367 diff changeset	45 }
2adf808343d6 - Renamed method start() to init() in Parser. aziz parents: 367 diff changeset	46 }
2adf808343d6 - Renamed method start() to init() in Parser. aziz parents: 367 diff changeset	47
65 6c21ae79fbb3 - Renamed function Token.span to Token.srcText. aziz parents: 0 diff changeset	48 class Parser
6c21ae79fbb3 - Renamed function Token.span to Token.srcText. aziz parents: 0 diff changeset	49 {
71 b3777cca323c - Added Identity and NotIdentity tokens. aziz parents: 70 diff changeset	50 Lexer lx;
318 a1c9d93a66e3 - Added member prevToken to Parser. aziz parents: 314 diff changeset	51 Token* token; /// Current non-whitespace token.
a1c9d93a66e3 - Added member prevToken to Parser. aziz parents: 314 diff changeset	52 Token* prevToken; /// Previous non-whitespace token.
71 b3777cca323c - Added Identity and NotIdentity tokens. aziz parents: 70 diff changeset	53
b3777cca323c - Added Identity and NotIdentity tokens. aziz parents: 70 diff changeset	54 Information[] errors;
b3777cca323c - Added Identity and NotIdentity tokens. aziz parents: 70 diff changeset	55
364 1059295c2727 - Every command module has an execute method now. aziz parents: 359 diff changeset	56 ImportDeclaration[] imports;
1059295c2727 - Every command module has an execute method now. aziz parents: 359 diff changeset	57
423 6057113f9a44 Refactored Parser.try_(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 422 diff changeset	58 this(char[] srcText, string filePath)
71 b3777cca323c - Added Identity and NotIdentity tokens. aziz parents: 70 diff changeset	59 {
423 6057113f9a44 Refactored Parser.try_(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 422 diff changeset	60 lx = new Lexer(srcText, filePath);
87 c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	61 }
c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	62
368 2adf808343d6 - Renamed method start() to init() in Parser. aziz parents: 367 diff changeset	63 private void init()
206 f9f5c0949a06 - Added method start(). aziz parents: 205 diff changeset	64 {
f9f5c0949a06 - Added method start(). aziz parents: 205 diff changeset	65 nT();
318 a1c9d93a66e3 - Added member prevToken to Parser. aziz parents: 314 diff changeset	66 prevToken = token;
206 f9f5c0949a06 - Added method start(). aziz parents: 205 diff changeset	67 }
f9f5c0949a06 - Added method start(). aziz parents: 205 diff changeset	68
87 c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	69 void nT()
c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	70 {
318 a1c9d93a66e3 - Added member prevToken to Parser. aziz parents: 314 diff changeset	71 prevToken = token;
132 c97a3f683d13 - Skipping comments in nT(). aziz parents: 131 diff changeset	72 do
c97a3f683d13 - Skipping comments in nT(). aziz parents: 131 diff changeset	73 {
c97a3f683d13 - Skipping comments in nT(). aziz parents: 131 diff changeset	74 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	75 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	76 } while (token.isWhitespace) // Skip whitespace
71 b3777cca323c - Added Identity and NotIdentity tokens. aziz parents: 70 diff changeset	77 }
484 265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	78
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 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	81 +/
265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	82 Declarations start()
102 6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	83 {
484 265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	84 init();
265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	85 auto begin = token;
265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	86 auto decls = new Declarations;
265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	87 if (token.type == T.Module)
265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	88 decls ~= parseModuleDeclaration();
265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	89 decls ~= parseDeclarationDefinitions();
265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	90 set(decls, begin);
265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	91 return decls;
102 6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	92 }
484 265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	93
265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	94 /++
265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	95 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	96 +/
265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	97 Expression start2()
265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	98 {
265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	99 init();
265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	100 return parseExpression();
265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	101 }
265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	102
423 6057113f9a44 Refactored Parser.try_(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 422 diff changeset	103 uint trying;
6057113f9a44 Refactored Parser.try_(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 422 diff changeset	104 uint errorCount;
6057113f9a44 Refactored Parser.try_(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 422 diff changeset	105
6057113f9a44 Refactored Parser.try_(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 422 diff changeset	106 /++
6057113f9a44 Refactored Parser.try_(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 422 diff changeset	107 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	108 the state of the lexer and parser are restored.
6057113f9a44 Refactored Parser.try_(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 422 diff changeset	109 +/
6057113f9a44 Refactored Parser.try_(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 422 diff changeset	110 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	111 {
423 6057113f9a44 Refactored Parser.try_(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 422 diff changeset	112 auto oldToken = this.token;
6057113f9a44 Refactored Parser.try_(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 422 diff changeset	113 auto oldPrevToken = this.prevToken;
6057113f9a44 Refactored Parser.try_(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 422 diff changeset	114 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	115
ea8c7459f1c4 Changed a lot of things in the Lexer. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 484 diff changeset	116 ++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	117 auto result = parseMethod();
485 ea8c7459f1c4 Changed a lot of things in the Lexer. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 484 diff changeset	118 --trying;
423 6057113f9a44 Refactored Parser.try_(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 422 diff changeset	119 // Check if an error occurred.
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	120 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	121 {
423 6057113f9a44 Refactored Parser.try_(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 422 diff changeset	122 // Restore members.
6057113f9a44 Refactored Parser.try_(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 422 diff changeset	123 token = oldToken;
6057113f9a44 Refactored Parser.try_(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 422 diff changeset	124 prevToken = oldPrevToken;
6057113f9a44 Refactored Parser.try_(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 422 diff changeset	125 lx.token = oldToken;
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	126 errorCount = oldCount;
214 45fc474c1678 - Changed 'failed' parameter of try_() to 'success'. aziz parents: 213 diff changeset	127 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	128 }
214 45fc474c1678 - Changed 'failed' parameter of try_() to 'success'. aziz parents: 213 diff changeset	129 else
45fc474c1678 - Changed 'failed' parameter of try_() to 'success'. aziz parents: 213 diff changeset	130 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	131 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	132 }
105 df34ec47fb81 - Added getState() method and State struct to Lexer. aziz parents: 104 diff changeset	133
484 265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	134 /++
265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	135 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	136 +/
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	137 Class set(Class)(Class node, Token* begin)
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	138 {
318 a1c9d93a66e3 - Added member prevToken to Parser. aziz parents: 314 diff changeset	139 node.setTokens(begin, this.prevToken);
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	140 return node;
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	141 }
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	142
484 265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	143 /++
485 ea8c7459f1c4 Changed a lot of things in the Lexer. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 484 diff changeset	144 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	145 +/
265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	146 bool isNodeSet(Node node)
265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	147 {
265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	148 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	149 }
265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	150
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	151 TOK peekNext()
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	152 {
239 7911f6a92e6e - Added 'new' and 'delete' declarations to Token and uncommented next and prev members. Added HEAD to TOK. aziz parents: 238 diff changeset	153 Token* next = token;
296 3a2afc425ceb - Fix in peekNext(): need to skip comments. aziz parents: 295 diff changeset	154 do
3a2afc425ceb - Fix in peekNext(): need to skip comments. aziz parents: 295 diff changeset	155 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	156 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	157 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	158 }
cac9c8d637ad Fix: members related to error info weren't updated correctly. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 429 diff changeset	159
cac9c8d637ad Fix: members related to error info weren't updated correctly. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 429 diff changeset	160 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	161 {
cac9c8d637ad Fix: members related to error info weren't updated correctly. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 429 diff changeset	162 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	163 do
cac9c8d637ad Fix: members related to error info weren't updated correctly. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 429 diff changeset	164 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	165 while (next.isWhitespace) // Skip whitespace
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	166 return next.type;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	167 }
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	168
102 6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	169 /++++++++++++++++++++++++++++++
6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	170 + Declaration parsing methods +
6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	171 ++++++++++++++++++++++++++++++/
6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	172
368 2adf808343d6 - Renamed method start() to init() in Parser. aziz parents: 367 diff changeset	173 Declaration parseModuleDeclaration()
2adf808343d6 - Renamed method start() to init() in Parser. aziz parents: 367 diff changeset	174 {
2adf808343d6 - Renamed method start() to init() in Parser. aziz parents: 367 diff changeset	175 auto begin = token;
2adf808343d6 - Renamed method start() to init() in Parser. aziz parents: 367 diff changeset	176 ModuleFQN moduleFQN;
2adf808343d6 - Renamed method start() to init() in Parser. aziz parents: 367 diff changeset	177 do
2adf808343d6 - Renamed method start() to init() in Parser. aziz parents: 367 diff changeset	178 {
2adf808343d6 - Renamed method start() to init() in Parser. aziz parents: 367 diff changeset	179 nT();
2adf808343d6 - Renamed method start() to init() in Parser. aziz parents: 367 diff changeset	180 moduleFQN ~= requireId();
2adf808343d6 - Renamed method start() to init() in Parser. aziz parents: 367 diff changeset	181 } while (token.type == T.Dot)
2adf808343d6 - Renamed method start() to init() in Parser. aziz parents: 367 diff changeset	182 require(T.Semicolon);
2adf808343d6 - Renamed method start() to init() in Parser. aziz parents: 367 diff changeset	183 return set(new ModuleDeclaration(moduleFQN), begin);
2adf808343d6 - Renamed method start() to init() in Parser. aziz parents: 367 diff changeset	184 }
2adf808343d6 - Renamed method start() to init() in Parser. aziz parents: 367 diff changeset	185
485 ea8c7459f1c4 Changed a lot of things in the Lexer. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 484 diff changeset	186 /++
ea8c7459f1c4 Changed a lot of things in the Lexer. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 484 diff changeset	187 DeclDefs:
ea8c7459f1c4 Changed a lot of things in the Lexer. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 484 diff changeset	188 DeclDef
ea8c7459f1c4 Changed a lot of things in the Lexer. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 484 diff changeset	189 DeclDefs
ea8c7459f1c4 Changed a lot of things in the Lexer. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 484 diff changeset	190 +/
305 df237b3b5f09 - Added class Declarations. aziz parents: 304 diff changeset	191 Declarations parseDeclarationDefinitions()
102 6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	192 {
305 df237b3b5f09 - Added class Declarations. aziz parents: 304 diff changeset	193 auto decls = new Declarations;
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	194 while (token.type != T.EOF)
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	195 decls ~= parseDeclarationDefinition();
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	196 return decls;
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	197 }
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	198
485 ea8c7459f1c4 Changed a lot of things in the Lexer. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 484 diff changeset	199 /++
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	200 DeclDefsBlock:
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	201 { }
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	202 { DeclDefs }
485 ea8c7459f1c4 Changed a lot of things in the Lexer. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 484 diff changeset	203 +/
305 df237b3b5f09 - Added class Declarations. aziz parents: 304 diff changeset	204 Declarations parseDeclarationDefinitionsBlock()
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	205 {
484 265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	206 auto begin = token;
305 df237b3b5f09 - Added class Declarations. aziz parents: 304 diff changeset	207 auto decls = new Declarations;
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	208 require(T.LBrace);
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	209 while (token.type != T.RBrace && token.type != T.EOF)
161 82c5cfc7d6d3 - Started implementation of parsing statements. aziz parents: 160 diff changeset	210 decls ~= parseDeclarationDefinition();
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	211 require(T.RBrace);
485 ea8c7459f1c4 Changed a lot of things in the Lexer. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 484 diff changeset	212 return set(decls, begin);
102 6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	213 }
6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	214
110 2fb631daaaae - Renamed methods. aziz parents: 109 diff changeset	215 Declaration parseDeclarationDefinition()
102 6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	216 {
262 0f22269e76ff - Changed some string types to Token. aziz* parents: 261 diff changeset	217 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	218 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	219 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	220 {
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	221 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	222 T.Pragma,
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	223 // Protection attributes
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	224 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	225 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	226 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	227 T.Protected,
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	228 T.Public:
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	229 decl = parseAttributeSpecifier();
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	230 break;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	231 // Storage classes
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	232 case T.Extern,
203 4f949a3a394b - synchronized is parsed as an Attribute in parseDeclarationDefinition() now. aziz parents: 202 diff changeset	233 T.Deprecated,
4f949a3a394b - synchronized is parsed as an Attribute in parseDeclarationDefinition() now. aziz parents: 202 diff changeset	234 T.Override,
4f949a3a394b - synchronized is parsed as an Attribute in parseDeclarationDefinition() now. aziz parents: 202 diff changeset	235 T.Abstract,
4f949a3a394b - synchronized is parsed as an Attribute in parseDeclarationDefinition() now. aziz parents: 202 diff changeset	236 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	237 //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	238 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	239 T.Const,
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	240 //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	241 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	242 T.Scope:
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	243 case_StaticAttribute:
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	244 case_InvariantAttribute: // D 2.0
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	245 decl = parseStorageAttribute();
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 break;
191 3ce110cefbc5 - Added code for parsing AliasDeclaration and TypedefDeclaration. aziz parents: 190 diff changeset	247 case T.Alias:
3ce110cefbc5 - Added code for parsing AliasDeclaration and TypedefDeclaration. aziz parents: 190 diff changeset	248 nT();
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	249 // TODO: parse StorageClasses?
226 aa38e1401217 - Fixed cases T.Alias and T.Typedef. Wrong function called. aziz parents: 225 diff changeset	250 decl = new AliasDeclaration(parseDeclaration());
191 3ce110cefbc5 - Added code for parsing AliasDeclaration and TypedefDeclaration. aziz parents: 190 diff changeset	251 break;
3ce110cefbc5 - Added code for parsing AliasDeclaration and TypedefDeclaration. aziz parents: 190 diff changeset	252 case T.Typedef:
3ce110cefbc5 - Added code for parsing AliasDeclaration and TypedefDeclaration. aziz parents: 190 diff changeset	253 nT();
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	254 // TODO: parse StorageClasses?
226 aa38e1401217 - Fixed cases T.Alias and T.Typedef. Wrong function called. aziz parents: 225 diff changeset	255 decl = new TypedefDeclaration(parseDeclaration());
191 3ce110cefbc5 - Added code for parsing AliasDeclaration and TypedefDeclaration. aziz parents: 190 diff changeset	256 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	257 case T.Static:
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	258 switch (peekNext())
125 240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	259 {
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	260 case T.Import:
429 052cbacb1642 Fix: removed infinite loop when parsing static imports. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 424 diff changeset	261 goto case_Import;
125 240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	262 case T.This:
119 363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	263 decl = parseStaticConstructorDeclaration();
125 240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	264 break;
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	265 case T.Tilde:
119 363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	266 decl = parseStaticDestructorDeclaration();
125 240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	267 break;
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	268 case T.If:
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	269 decl = parseStaticIfDeclaration();
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	270 break;
127 cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration. aziz parents: 126 diff changeset	271 case T.Assert:
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration. aziz parents: 126 diff changeset	272 decl = parseStaticAssertDeclaration();
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration. aziz parents: 126 diff changeset	273 break;
125 240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	274 default:
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	275 goto case_StaticAttribute;
125 240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	276 }
228 a4c5ee9527b7 - Replaced assert(0); with break; in case T.Static. Renamed local t to next. aziz parents: 227 diff changeset	277 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	278 case T.Import:
429 052cbacb1642 Fix: removed infinite loop when parsing static imports. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 424 diff changeset	279 case_Import:
107 722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	280 decl = parseImportDeclaration();
364 1059295c2727 - Every command module has an execute method now. aziz parents: 359 diff changeset	281 assert(decl && decl.kind == NodeKind.ImportDeclaration);
1059295c2727 - Every command module has an execute method now. aziz parents: 359 diff changeset	282 imports ~= cast(ImportDeclaration)cast(void*)decl;
109 d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	283 break;
107 722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	284 case T.Enum:
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	285 decl = parseEnumDeclaration();
109 d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	286 break;
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	287 case T.Class:
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	288 decl = parseClassDeclaration();
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	289 break;
112 004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	290 case T.Interface:
004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	291 decl = parseInterfaceDeclaration();
004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	292 break;
113 20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	293 case T.Struct, T.Union:
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	294 decl = parseAggregateDeclaration();
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	295 break;
117 79857de26e86 - Moved class Parameter to module Types. Added struct Parameters. aziz parents: 116 diff changeset	296 case T.This:
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters. aziz parents: 116 diff changeset	297 decl = parseConstructorDeclaration();
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters. aziz parents: 116 diff changeset	298 break;
118 379f33cbd521 - Added parseDestructorDeclaration() and DestructorDeclaration class. aziz parents: 117 diff changeset	299 case T.Tilde:
379f33cbd521 - Added parseDestructorDeclaration() and DestructorDeclaration class. aziz parents: 117 diff changeset	300 decl = parseDestructorDeclaration();
379f33cbd521 - Added parseDestructorDeclaration() and DestructorDeclaration class. aziz parents: 117 diff changeset	301 break;
120 e5329dac0405 - Added parseInvariantDeclaration(). aziz parents: 119 diff changeset	302 case T.Invariant:
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	303 version(D2)
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	304 {
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	305 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	306 if (peekAfter(next) == T.LParen)
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	307 {
434 cac9c8d637ad Fix: members related to error info weren't updated correctly. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 429 diff changeset	308 if (peekAfter(next) != T.RParen)
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	309 goto case_Declaration;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	310 }
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	311 else
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	312 goto case_InvariantAttribute;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	313 }
120 e5329dac0405 - Added parseInvariantDeclaration(). aziz parents: 119 diff changeset	314 decl = parseInvariantDeclaration();
e5329dac0405 - Added parseInvariantDeclaration(). aziz parents: 119 diff changeset	315 break;
121 030933c6b5f0 - Added parseUnittestDeclaration(). aziz parents: 120 diff changeset	316 case T.Unittest:
030933c6b5f0 - Added parseUnittestDeclaration(). aziz parents: 120 diff changeset	317 decl = parseUnittestDeclaration();
030933c6b5f0 - Added parseUnittestDeclaration(). aziz parents: 120 diff changeset	318 break;
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	319 case T.Debug:
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	320 decl = parseDebugDeclaration();
140 64d7186b087c - Implemented parseTemplateParameters(). aziz parents: 139 diff changeset	321 break;
146 8180eb84e69c - Started implementation of parseAttributeSpecifier(). aziz parents: 145 diff changeset	322 case T.Version:
8180eb84e69c - Started implementation of parseAttributeSpecifier(). aziz parents: 145 diff changeset	323 decl = parseVersionDeclaration();
8180eb84e69c - Started implementation of parseAttributeSpecifier(). aziz parents: 145 diff changeset	324 break;
140 64d7186b087c - Implemented parseTemplateParameters(). aziz parents: 139 diff changeset	325 case T.Template:
64d7186b087c - Implemented parseTemplateParameters(). aziz parents: 139 diff changeset	326 decl = parseTemplateDeclaration();
64d7186b087c - Implemented parseTemplateParameters(). aziz parents: 139 diff changeset	327 break;
141 7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration(). aziz parents: 140 diff changeset	328 case T.New:
7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration(). aziz parents: 140 diff changeset	329 decl = parseNewDeclaration();
7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration(). aziz parents: 140 diff changeset	330 break;
7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration(). aziz parents: 140 diff changeset	331 case T.Delete:
7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration(). aziz parents: 140 diff changeset	332 decl = parseDeleteDeclaration();
7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration(). aziz parents: 140 diff changeset	333 break;
146 8180eb84e69c - Started implementation of parseAttributeSpecifier(). aziz parents: 145 diff changeset	334 case T.Mixin:
256 8f27920ae17a - Made parseMixinDeclaration() a template. aziz parents: 255 diff changeset	335 decl = parseMixin!(MixinDeclaration)();
146 8180eb84e69c - Started implementation of parseAttributeSpecifier(). aziz parents: 145 diff changeset	336 break;
129 a9244d409652 - Added class EmptyDeclaration. aziz parents: 128 diff changeset	337 case T.Semicolon:
a9244d409652 - Added class EmptyDeclaration. aziz parents: 128 diff changeset	338 nT();
a9244d409652 - Added class EmptyDeclaration. aziz parents: 128 diff changeset	339 decl = new EmptyDeclaration();
a9244d409652 - Added class EmptyDeclaration. aziz parents: 128 diff changeset	340 break;
192 5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	341 // Declaration
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	342 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	343 // IntegralType
192 5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	344 case T.Char, T.Wchar, T.Dchar, T.Bool,
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	345 T.Byte, T.Ubyte, T.Short, T.Ushort,
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	346 T.Int, T.Uint, T.Long, T.Ulong,
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	347 T.Float, T.Double, T.Real,
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	348 T.Ifloat, T.Idouble, T.Ireal,
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	349 T.Cfloat, T.Cdouble, T.Creal, T.Void:
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	350 case_Declaration:
483 180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	351 return parseDeclaration();
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	352 /+case T.Module:
150 753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	353 // 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	354 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	355 default:
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	356 error(MID.ExpectedButFound, "Declaration", token.srcText);
292 076152e945e0 - Added member Node[] children to class Node. aziz parents: 291 diff changeset	357 decl = new IllegalDeclaration(token);
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	358 nT();
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	359 }
262 0f22269e76ff - Changed some string types to Token. aziz* parents: 261 diff changeset	360 set(decl, begin);
129 a9244d409652 - Added class EmptyDeclaration. aziz parents: 128 diff changeset	361 return decl;
102 6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	362 }
6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	363
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	364 /*
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	365 DeclarationsBlock:
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	366 : DeclDefs
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	367 { }
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	368 { DeclDefs }
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	369 DeclDef
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	370 */
404 fe46b5ea7a18 Added method parseDeclarationsBlockNoColon(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 400 diff changeset	371 Declaration parseDeclarationsBlock(bool noColon = false)
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	372 {
305 df237b3b5f09 - Added class Declarations. aziz parents: 304 diff changeset	373 Declaration d;
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	374 switch (token.type)
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	375 {
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	376 case T.LBrace:
305 df237b3b5f09 - Added class Declarations. aziz parents: 304 diff changeset	377 d = parseDeclarationDefinitionsBlock();
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	378 break;
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	379 case T.Colon:
404 fe46b5ea7a18 Added method parseDeclarationsBlockNoColon(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 400 diff changeset	380 if (noColon == true)
fe46b5ea7a18 Added method parseDeclarationsBlockNoColon(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 400 diff changeset	381 goto default;
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	382 nT();
484 265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	383 auto begin = token;
305 df237b3b5f09 - Added class Declarations. aziz parents: 304 diff changeset	384 auto decls = new Declarations;
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	385 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	386 decls ~= parseDeclarationDefinition();
484 265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	387 d = set(decls, begin);
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	388 break;
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	389 default:
305 df237b3b5f09 - Added class Declarations. aziz parents: 304 diff changeset	390 d = parseDeclarationDefinition();
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	391 }
484 265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	392 assert(isNodeSet(d));
305 df237b3b5f09 - Added class Declarations. aziz parents: 304 diff changeset	393 return d;
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	394 }
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	395
404 fe46b5ea7a18 Added method parseDeclarationsBlockNoColon(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 400 diff changeset	396 Declaration parseDeclarationsBlockNoColon()
fe46b5ea7a18 Added method parseDeclarationsBlockNoColon(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 400 diff changeset	397 {
fe46b5ea7a18 Added method parseDeclarationsBlockNoColon(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 400 diff changeset	398 return parseDeclarationsBlock(true);
fe46b5ea7a18 Added method parseDeclarationsBlockNoColon(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 400 diff changeset	399 }
fe46b5ea7a18 Added method parseDeclarationsBlockNoColon(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 400 diff changeset	400
483 180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	401 /++
180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	402 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	403 Params:
180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	404 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	405 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	406 +/
180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	407 Declaration parseDeclaration(StorageClass stc = StorageClass.None, bool optionalParameterList = true)
192 5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	408 {
483 180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	409 auto begin = token;
202 8aecf8925c5f - Added code for parsing AutoDeclaration in parseDeclaration(). aziz parents: 201 diff changeset	410 Type type;
262 0f22269e76ff - Changed some string types to Token. aziz* parents: 261 diff changeset	411 Token* ident;
192 5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	412
202 8aecf8925c5f - Added code for parsing AutoDeclaration in parseDeclaration(). aziz parents: 201 diff changeset	413 // Check for AutoDeclaration
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	414 if (stc != StorageClass.None &&
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	415 token.type == T.Identifier &&
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	416 peekNext() == T.Assign)
192 5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	417 {
262 0f22269e76ff - Changed some string types to Token. aziz* parents: 261 diff changeset	418 ident = token;
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	419 nT();
202 8aecf8925c5f - Added code for parsing AutoDeclaration in parseDeclaration(). aziz parents: 201 diff changeset	420 }
8aecf8925c5f - Added code for parsing AutoDeclaration in parseDeclaration(). aziz parents: 201 diff changeset	421 else
8aecf8925c5f - Added code for parsing AutoDeclaration in parseDeclaration(). aziz parents: 201 diff changeset	422 {
8aecf8925c5f - Added code for parsing AutoDeclaration in parseDeclaration(). aziz parents: 201 diff changeset	423 type = parseType();
8aecf8925c5f - Added code for parsing AutoDeclaration in parseDeclaration(). aziz parents: 201 diff changeset	424 if (token.type == T.LParen)
8aecf8925c5f - Added code for parsing AutoDeclaration in parseDeclaration(). aziz parents: 201 diff changeset	425 {
483 180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	426 // 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	427 // 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	428 // Example:
180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	429 // void foo() {
180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	430 // // 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	431 // some_type (*p_func)(int);
180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	432 // // 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	433 // 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	434 // }
180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	435 // // 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	436 // something(*p);
180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	437 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	438 }
b18b0cd8f8cd Fixed parsing C function pointers in declarations. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 414 diff changeset	439 else
b18b0cd8f8cd Fixed parsing C function pointers in declarations. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 414 diff changeset	440 {
b18b0cd8f8cd Fixed parsing C function pointers in declarations. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 414 diff changeset	441 ident = requireId();
b18b0cd8f8cd Fixed parsing C function pointers in declarations. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 414 diff changeset	442 // Type FunctionName ( ParameterList ) FunctionBody
b18b0cd8f8cd Fixed parsing C function pointers in declarations. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 414 diff changeset	443 if (token.type == T.LParen)
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	444 {
415 b18b0cd8f8cd Fixed parsing C function pointers in declarations. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 414 diff changeset	445 // It's a function declaration
b18b0cd8f8cd Fixed parsing C function pointers in declarations. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 414 diff changeset	446 TemplateParameters tparams;
b18b0cd8f8cd Fixed parsing C function pointers in declarations. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 414 diff changeset	447 if (tokenAfterParenIs(T.LParen))
b18b0cd8f8cd Fixed parsing C function pointers in declarations. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 414 diff changeset	448 {
b18b0cd8f8cd Fixed parsing C function pointers in declarations. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 414 diff changeset	449 // ( TemplateParameterList ) ( ParameterList )
b18b0cd8f8cd Fixed parsing C function pointers in declarations. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 414 diff changeset	450 tparams = parseTemplateParameterList();
b18b0cd8f8cd Fixed parsing C function pointers in declarations. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 414 diff changeset	451 }
b18b0cd8f8cd Fixed parsing C function pointers in declarations. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 414 diff changeset	452
b18b0cd8f8cd Fixed parsing C function pointers in declarations. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 414 diff changeset	453 auto params = parseParameterList();
b18b0cd8f8cd Fixed parsing C function pointers in declarations. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 414 diff changeset	454 // ReturnType FunctionName ( ParameterList )
b18b0cd8f8cd Fixed parsing C function pointers in declarations. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 414 diff changeset	455 auto funcBody = parseFunctionBody();
483 180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	456 return set(new FunctionDeclaration(type, ident, tparams, params, funcBody), begin);
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	457 }
415 b18b0cd8f8cd Fixed parsing C function pointers in declarations. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 414 diff changeset	458 type = parseDeclaratorSuffix(type);
202 8aecf8925c5f - Added code for parsing AutoDeclaration in parseDeclaration(). aziz parents: 201 diff changeset	459 }
192 5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	460 }
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	461
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	462 // It's a variable declaration.
262 0f22269e76ff - Changed some string types to Token. aziz* parents: 261 diff changeset	463 Token*[] idents = [ident];
194 b3604b237292 - Implemented parsing variable declarations. aziz parents: 193 diff changeset	464 Expression[] values;
199 a95fee6e4b7e - Fix: parseDeclaration(): appending null to values when no initializer present. aziz parents: 198 diff changeset	465 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	466 while (token.type == T.Comma)
b3604b237292 - Implemented parsing variable declarations. aziz parents: 193 diff changeset	467 {
222 4f31e4671e06 - Fix: nT() wasn't called in while loop to skip T.Comma. aziz parents: 220 diff changeset	468 nT();
262 0f22269e76ff - Changed some string types to Token. aziz* parents: 261 diff changeset	469 idents ~= requireId();
194 b3604b237292 - Implemented parsing variable declarations. aziz parents: 193 diff changeset	470 LenterLoop:
b3604b237292 - Implemented parsing variable declarations. aziz parents: 193 diff changeset	471 if (token.type == T.Assign)
b3604b237292 - Implemented parsing variable declarations. aziz parents: 193 diff changeset	472 {
b3604b237292 - Implemented parsing variable declarations. aziz parents: 193 diff changeset	473 nT();
b3604b237292 - Implemented parsing variable declarations. aziz parents: 193 diff changeset	474 values ~= parseInitializer();
b3604b237292 - Implemented parsing variable declarations. aziz parents: 193 diff changeset	475 }
199 a95fee6e4b7e - Fix: parseDeclaration(): appending null to values when no initializer present. aziz parents: 198 diff changeset	476 else
a95fee6e4b7e - Fix: parseDeclaration(): appending null to values when no initializer present. aziz parents: 198 diff changeset	477 values ~= null;
194 b3604b237292 - Implemented parsing variable declarations. aziz parents: 193 diff changeset	478 }
b3604b237292 - Implemented parsing variable declarations. aziz parents: 193 diff changeset	479 require(T.Semicolon);
483 180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	480 return set(new VariableDeclaration(type, idents, values), begin);
194 b3604b237292 - Implemented parsing variable declarations. aziz parents: 193 diff changeset	481 }
192 5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	482
194 b3604b237292 - Implemented parsing variable declarations. aziz parents: 193 diff changeset	483 Expression parseInitializer()
b3604b237292 - Implemented parsing variable declarations. aziz parents: 193 diff changeset	484 {
198 88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	485 if (token.type == T.Void)
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	486 {
266 fea4e8b6cea5 - Added begin variables and calls to set(). aziz parents: 265 diff changeset	487 auto begin = token;
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	488 auto next = peekNext();
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	489 if (next == T.Comma \|\| next == T.Semicolon)
198 88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	490 {
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	491 nT();
266 fea4e8b6cea5 - Added begin variables and calls to set(). aziz parents: 265 diff changeset	492 return set(new VoidInitializer(), begin);
198 88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	493 }
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	494 }
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	495 return parseNonVoidInitializer();
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	496 }
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	497
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	498 Expression parseNonVoidInitializer()
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	499 {
266 fea4e8b6cea5 - Added begin variables and calls to set(). aziz parents: 265 diff changeset	500 auto begin = token;
198 88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	501 Expression init;
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	502 switch (token.type)
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	503 {
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	504 case T.LBracket:
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	505 // ArrayInitializer:
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	506 // [ ]
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	507 // [ ArrayMemberInitializations ]
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	508 Expression[] keys;
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	509 Expression[] values;
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	510
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	511 nT();
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	512 while (token.type != T.RBracket)
198 88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	513 {
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	514 auto e = parseNonVoidInitializer();
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	515 if (token.type == T.Colon)
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	516 {
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	517 nT();
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	518 keys ~= e;
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	519 values ~= parseNonVoidInitializer();
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	520 }
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	521 else
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	522 {
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	523 keys ~= null;
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	524 values ~= e;
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	525 }
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	526
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	527 if (token.type != T.Comma)
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	528 break;
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	529 nT();
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	530 }
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	531 require(T.RBracket);
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	532 init = new ArrayInitializer(keys, values);
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	533 break;
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	534 case T.LBrace:
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	535 // StructInitializer:
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	536 // { }
198 88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	537 // { StructMemberInitializers }
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	538 Expression parseStructInitializer()
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	539 {
263 ebcf7941f1db - Changed some string types to Token. aziz* parents: 262 diff changeset	540 Token*[] idents;
198 88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	541 Expression[] values;
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	542
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	543 nT();
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	544 while (token.type != T.RBrace)
198 88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	545 {
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	546 if (token.type == T.Identifier)
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	547 {
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	548 // Peek for colon to see if this is a member identifier.
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	549 if (peekNext() == T.Colon)
198 88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	550 {
263 ebcf7941f1db - Changed some string types to Token. aziz* parents: 262 diff changeset	551 idents ~= token;
198 88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	552 nT();
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	553 nT();
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	554 }
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	555 }
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	556 // NonVoidInitializer
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	557 values ~= parseNonVoidInitializer();
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	558
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	559 if (token.type != T.Comma)
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	560 break;
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	561 nT();
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	562 }
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	563 require(T.RBrace);
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	564 return new StructInitializer(idents, values);
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	565 }
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	566
214 45fc474c1678 - Changed 'failed' parameter of try_() to 'success'. aziz parents: 213 diff changeset	567 bool success;
423 6057113f9a44 Refactored Parser.try_(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 422 diff changeset	568 auto si = try_(&parseStructInitializer, success);
214 45fc474c1678 - Changed 'failed' parameter of try_() to 'success'. aziz parents: 213 diff changeset	569 if (success)
200 61f60112ac63 - Fix: parsing AssignExpression when parsing StructInitializer failed. aziz parents: 199 diff changeset	570 {
198 88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	571 init = si;
200 61f60112ac63 - Fix: parsing AssignExpression when parsing StructInitializer failed. aziz parents: 199 diff changeset	572 break;
61f60112ac63 - Fix: parsing AssignExpression when parsing StructInitializer failed. aziz parents: 199 diff changeset	573 }
216 984d48932bce - Added class EmptyStatement. aziz parents: 214 diff changeset	574 assert(token.type == T.LBrace);
200 61f60112ac63 - Fix: parsing AssignExpression when parsing StructInitializer failed. aziz parents: 199 diff changeset	575 //goto default;
198 88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	576 default:
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	577 init = parseAssignExpression();
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	578 }
266 fea4e8b6cea5 - Added begin variables and calls to set(). aziz parents: 265 diff changeset	579 set(init, begin);
198 88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	580 return init;
192 5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	581 }
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	582
267 f3dfa6208ed3 - Removed parameter func from parseFunctionBody(). Creating new FunctionBody inside the method. aziz parents: 266 diff changeset	583 FunctionBody parseFunctionBody()
192 5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	584 {
268 c19b68a4e3db - FunctionBody inherits from Node now. aziz parents: 267 diff changeset	585 auto begin = token;
267 f3dfa6208ed3 - Removed parameter func from parseFunctionBody(). Creating new FunctionBody inside the method. aziz parents: 266 diff changeset	586 auto func = new FunctionBody;
192 5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	587 while (1)
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	588 {
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	589 switch (token.type)
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	590 {
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	591 case T.LBrace:
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	592 func.funcBody = parseStatements();
192 5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	593 break;
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	594 case T.Semicolon:
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	595 nT();
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	596 break;
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	597 case T.In:
342 f13d551d7c4f - Added error messages MID.InContract and MID.OutContract. aziz parents: 341 diff changeset	598 if (func.inBody)
f13d551d7c4f - Added error messages MID.InContract and MID.OutContract. aziz parents: 341 diff changeset	599 error(MID.InContract);
226 aa38e1401217 - Fixed cases T.Alias and T.Typedef. Wrong function called. aziz parents: 225 diff changeset	600 nT();
192 5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	601 func.inBody = parseStatements();
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	602 continue;
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	603 case T.Out:
342 f13d551d7c4f - Added error messages MID.InContract and MID.OutContract. aziz parents: 341 diff changeset	604 if (func.outBody)
f13d551d7c4f - Added error messages MID.InContract and MID.OutContract. aziz parents: 341 diff changeset	605 error(MID.OutContract);
192 5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	606 nT();
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	607 if (token.type == T.LParen)
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	608 {
226 aa38e1401217 - Fixed cases T.Alias and T.Typedef. Wrong function called. aziz parents: 225 diff changeset	609 nT();
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	610 func.outIdent = requireId();
192 5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	611 require(T.RParen);
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	612 }
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	613 func.outBody = parseStatements();
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	614 continue;
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	615 case T.Body:
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	616 nT();
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	617 goto case T.LBrace;
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	618 default:
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	619 error(MID.ExpectedButFound, "FunctionBody", token.srcText);
192 5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	620 }
342 f13d551d7c4f - Added error messages MID.InContract and MID.OutContract. aziz parents: 341 diff changeset	621 break; // Exit loop.
192 5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	622 }
268 c19b68a4e3db - FunctionBody inherits from Node now. aziz parents: 267 diff changeset	623 set(func, begin);
299 559d5d62e0c1 - Added checks for null before adding member to Node.children. aziz parents: 298 diff changeset	624 func.finishConstruction();
193 2a2975b6d539 - Using parseFunctionBody() when parsing FunctionLiteralExpression. aziz parents: 192 diff changeset	625 return func;
192 5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	626 }
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	627
359 511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	628 Linkage parseLinkage()
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	629 {
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	630 if (token.type != T.LParen)
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	631 return null;
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	632
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	633 nT(); // Skip (
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	634 if (token.type == T.RParen)
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	635 {
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	636 error(MID.MissingLinkageType);
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	637 nT();
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	638 return null;
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	639 }
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	640
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	641 auto begin = token;
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	642 auto ident = requireId();
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	643
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	644 Linkage.Type linktype;
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	645 switch (ident ? ident.identifier : null)
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	646 {
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	647 case "C":
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	648 if (token.type == T.PlusPlus)
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	649 {
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	650 nT();
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	651 linktype = Linkage.Type.Cpp;
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	652 break;
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	653 }
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	654 linktype = Linkage.Type.C;
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	655 break;
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	656 case "D":
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	657 linktype = Linkage.Type.D;
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	658 break;
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	659 case "Windows":
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	660 linktype = Linkage.Type.Windows;
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	661 break;
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	662 case "Pascal":
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	663 linktype = Linkage.Type.Pascal;
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	664 break;
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	665 case "System":
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	666 linktype = Linkage.Type.System;
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	667 break;
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	668 default:
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	669 error(MID.UnrecognizedLinkageType, token.srcText);
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	670 nT();
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	671 }
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	672 auto linkage = new Linkage(linktype);
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	673 set(linkage, begin);
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	674 require(T.RParen);
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	675 return linkage;
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	676 }
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	677
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	678 Declaration parseStorageAttribute()
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	679 {
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	680 StorageClass stc, tmp;
359 511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	681 Linkage.Category link_cat;
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	682
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	683 void addStorageClass()
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	684 {
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	685 if (stc & tmp)
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	686 error(MID.RedundantStorageClass, token.srcText);
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	687 else
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	688 stc \|= tmp;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	689 }
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	690
305 df237b3b5f09 - Added class Declarations. aziz parents: 304 diff changeset	691 Declaration parse()
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	692 {
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	693 Declaration decl;
359 511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	694 auto begin = token;
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	695 switch (token.type)
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	696 {
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	697 case T.Extern:
359 511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	698 stc \|= StorageClass.Extern;
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	699 nT();
359 511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	700 Linkage linkage = parseLinkage();
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	701
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	702 // Check for redundancy.
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	703 Linkage.Category link_cat_tmp = Linkage.getCategory(linkage);
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	704 if (link_cat & link_cat_tmp)
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	705 {
359 511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	706 char[] srcText = begin.srcText;
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	707 if (link_cat_tmp == Linkage.Category.MangleSymbol)
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	708 srcText = begin.start[0 .. prevToken.end - begin.start];
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	709 error(MID.RedundantStorageClass, srcText);
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	710 }
359 511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	711 else
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	712 link_cat \|= link_cat_tmp;
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	713
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	714 decl = set(new ExternDeclaration(linkage, parse()), begin);
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	715 break;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	716 case T.Override:
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	717 tmp = StorageClass.Override;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	718 goto Lcommon;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	719 case T.Deprecated:
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	720 tmp = StorageClass.Deprecated;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	721 goto Lcommon;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	722 case T.Abstract:
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	723 tmp = StorageClass.Abstract;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	724 goto Lcommon;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	725 case T.Synchronized:
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	726 tmp = StorageClass.Synchronized;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	727 goto Lcommon;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	728 case T.Static:
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	729 tmp = StorageClass.Static;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	730 goto Lcommon;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	731 case T.Final:
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	732 tmp = StorageClass.Final;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	733 goto Lcommon;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	734 case T.Const:
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	735 version(D2)
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	736 {
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	737 if (peekNext() == T.LParen)
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	738 goto case_Declaration;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	739 }
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	740 tmp = StorageClass.Const;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	741 goto Lcommon;
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	742 version(D2)
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	743 {
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	744 case T.Invariant: // D 2.0
359 511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	745 // TODO: could this be a class invariant?
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	746 if (peekNext() == T.LParen)
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	747 goto case_Declaration;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	748 tmp = StorageClass.Invariant;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	749 goto Lcommon;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	750 }
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	751 case T.Auto:
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	752 tmp = StorageClass.Auto;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	753 goto Lcommon;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	754 case T.Scope:
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	755 tmp = StorageClass.Scope;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	756 goto Lcommon;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	757 Lcommon:
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	758 addStorageClass();
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	759 auto tok = token.type;
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	760 nT();
359 511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	761 decl = set(new AttributeDeclaration(tok, parse()), begin);
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	762 break;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	763 case T.Identifier:
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	764 case_Declaration:
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	765 // This could be a normal Declaration or an AutoDeclaration
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	766 decl = parseDeclaration(stc);
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	767 break;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	768 default:
305 df237b3b5f09 - Added class Declarations. aziz parents: 304 diff changeset	769 decl = parseDeclarationsBlock();
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	770 }
305 df237b3b5f09 - Added class Declarations. aziz parents: 304 diff changeset	771 return decl;
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	772 }
305 df237b3b5f09 - Added class Declarations. aziz parents: 304 diff changeset	773 return parse();
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	774 }
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	775
260 b83180748ae6 - Added method parseAlignAttribute(). aziz parents: 259 diff changeset	776 Token* parseAlignAttribute()
b83180748ae6 - Added method parseAlignAttribute(). aziz parents: 259 diff changeset	777 {
b83180748ae6 - Added method parseAlignAttribute(). aziz parents: 259 diff changeset	778 assert(token.type == T.Align);
b83180748ae6 - Added method parseAlignAttribute(). aziz parents: 259 diff changeset	779 nT(); // Skip align keyword.
b83180748ae6 - Added method parseAlignAttribute(). aziz parents: 259 diff changeset	780 Token* tok;
b83180748ae6 - Added method parseAlignAttribute(). aziz parents: 259 diff changeset	781 if (token.type == T.LParen)
b83180748ae6 - Added method parseAlignAttribute(). aziz parents: 259 diff changeset	782 {
b83180748ae6 - Added method parseAlignAttribute(). aziz parents: 259 diff changeset	783 nT();
b83180748ae6 - Added method parseAlignAttribute(). aziz parents: 259 diff changeset	784 if (token.type == T.Int32)
b83180748ae6 - Added method parseAlignAttribute(). aziz parents: 259 diff changeset	785 {
b83180748ae6 - Added method parseAlignAttribute(). aziz parents: 259 diff changeset	786 tok = token;
b83180748ae6 - Added method parseAlignAttribute(). aziz parents: 259 diff changeset	787 nT();
b83180748ae6 - Added method parseAlignAttribute(). aziz parents: 259 diff changeset	788 }
b83180748ae6 - Added method parseAlignAttribute(). aziz parents: 259 diff changeset	789 else
b83180748ae6 - Added method parseAlignAttribute(). aziz parents: 259 diff changeset	790 expected(T.Int32);
b83180748ae6 - Added method parseAlignAttribute(). aziz parents: 259 diff changeset	791 require(T.RParen);
b83180748ae6 - Added method parseAlignAttribute(). aziz parents: 259 diff changeset	792 }
b83180748ae6 - Added method parseAlignAttribute(). aziz parents: 259 diff changeset	793 return tok;
b83180748ae6 - Added method parseAlignAttribute(). aziz parents: 259 diff changeset	794 }
b83180748ae6 - Added method parseAlignAttribute(). aziz parents: 259 diff changeset	795
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	796 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	797 {
146 8180eb84e69c - Started implementation of parseAttributeSpecifier(). aziz parents: 145 diff changeset	798 Declaration decl;
8180eb84e69c - Started implementation of parseAttributeSpecifier(). aziz parents: 145 diff changeset	799
8180eb84e69c - Started implementation of parseAttributeSpecifier(). aziz parents: 145 diff changeset	800 switch (token.type)
8180eb84e69c - Started implementation of parseAttributeSpecifier(). aziz parents: 145 diff changeset	801 {
8180eb84e69c - Started implementation of parseAttributeSpecifier(). aziz parents: 145 diff changeset	802 case T.Align:
8180eb84e69c - Started implementation of parseAttributeSpecifier(). aziz parents: 145 diff changeset	803 int size = -1;
260 b83180748ae6 - Added method parseAlignAttribute(). aziz parents: 259 diff changeset	804 auto intTok = parseAlignAttribute();
b83180748ae6 - Added method parseAlignAttribute(). aziz parents: 259 diff changeset	805 if (intTok)
b83180748ae6 - Added method parseAlignAttribute(). aziz parents: 259 diff changeset	806 size = intTok.int_;
146 8180eb84e69c - Started implementation of parseAttributeSpecifier(). aziz parents: 145 diff changeset	807 decl = new AlignDeclaration(size, parseDeclarationsBlock());
8180eb84e69c - Started implementation of parseAttributeSpecifier(). aziz parents: 145 diff changeset	808 break;
8180eb84e69c - Started implementation of parseAttributeSpecifier(). aziz parents: 145 diff changeset	809 case T.Pragma:
147 e46b3415ec16 - Implemented parsing pragma declarations. aziz parents: 146 diff changeset	810 // Pragma:
e46b3415ec16 - Implemented parsing pragma declarations. aziz parents: 146 diff changeset	811 // pragma ( Identifier )
e46b3415ec16 - Implemented parsing pragma declarations. aziz parents: 146 diff changeset	812 // pragma ( Identifier , ExpressionList )
e46b3415ec16 - Implemented parsing pragma declarations. aziz parents: 146 diff changeset	813 // ExpressionList:
e46b3415ec16 - Implemented parsing pragma declarations. aziz parents: 146 diff changeset	814 // AssignExpression
e46b3415ec16 - Implemented parsing pragma declarations. aziz parents: 146 diff changeset	815 // AssignExpression , ExpressionList
e46b3415ec16 - Implemented parsing pragma declarations. aziz parents: 146 diff changeset	816 nT();
245 93d37f874658 - Changed type of pragma identifier to Token. aziz* parents: 244 diff changeset	817 Token* ident;
147 e46b3415ec16 - Implemented parsing pragma declarations. aziz parents: 146 diff changeset	818 Expression[] args;
305 df237b3b5f09 - Added class Declarations. aziz parents: 304 diff changeset	819 Declaration decls;
147 e46b3415ec16 - Implemented parsing pragma declarations. aziz parents: 146 diff changeset	820
e46b3415ec16 - Implemented parsing pragma declarations. aziz parents: 146 diff changeset	821 require(T.LParen);
245 93d37f874658 - Changed type of pragma identifier to Token. aziz* parents: 244 diff changeset	822 ident = requireId();
147 e46b3415ec16 - Implemented parsing pragma declarations. aziz parents: 146 diff changeset	823
e46b3415ec16 - Implemented parsing pragma declarations. aziz parents: 146 diff changeset	824 if (token.type == T.Comma)
244 829fdb2e2915 - Fix: parsing at least one argument in pragma declarations/statements. aziz parents: 243 diff changeset	825 {
829fdb2e2915 - Fix: parsing at least one argument in pragma declarations/statements. aziz parents: 243 diff changeset	826 // Parse at least one argument.
829fdb2e2915 - Fix: parsing at least one argument in pragma declarations/statements. aziz parents: 243 diff changeset	827 nT();
829fdb2e2915 - Fix: parsing at least one argument in pragma declarations/statements. aziz parents: 243 diff changeset	828 args ~= parseAssignExpression();
829fdb2e2915 - Fix: parsing at least one argument in pragma declarations/statements. aziz parents: 243 diff changeset	829 }
829fdb2e2915 - Fix: parsing at least one argument in pragma declarations/statements. aziz parents: 243 diff changeset	830
829fdb2e2915 - Fix: parsing at least one argument in pragma declarations/statements. aziz parents: 243 diff changeset	831 if (token.type == T.Comma)
829fdb2e2915 - Fix: parsing at least one argument in pragma declarations/statements. aziz parents: 243 diff changeset	832 args ~= parseArguments(T.RParen);
147 e46b3415ec16 - Implemented parsing pragma declarations. aziz parents: 146 diff changeset	833 else
e46b3415ec16 - Implemented parsing pragma declarations. aziz parents: 146 diff changeset	834 require(T.RParen);
e46b3415ec16 - Implemented parsing pragma declarations. aziz parents: 146 diff changeset	835
e46b3415ec16 - Implemented parsing pragma declarations. aziz parents: 146 diff changeset	836 if (token.type == T.Semicolon)
313 1c1adededd8f - Fix: assign new EmptyDeclaration to decls when parsing PragmaStatement. aziz parents: 312 diff changeset	837 {
147 e46b3415ec16 - Implemented parsing pragma declarations. aziz parents: 146 diff changeset	838 nT();
484 265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	839 // TODO: call set()?
313 1c1adededd8f - Fix: assign new EmptyDeclaration to decls when parsing PragmaStatement. aziz parents: 312 diff changeset	840 decls = new EmptyDeclaration();
1c1adededd8f - Fix: assign new EmptyDeclaration to decls when parsing PragmaStatement. aziz parents: 312 diff changeset	841 }
147 e46b3415ec16 - Implemented parsing pragma declarations. aziz parents: 146 diff changeset	842 else
e46b3415ec16 - Implemented parsing pragma declarations. aziz parents: 146 diff changeset	843 decls = parseDeclarationsBlock();
e46b3415ec16 - Implemented parsing pragma declarations. aziz parents: 146 diff changeset	844
e46b3415ec16 - Implemented parsing pragma declarations. aziz parents: 146 diff changeset	845 decl = new PragmaDeclaration(ident, args, decls);
e46b3415ec16 - Implemented parsing pragma declarations. aziz parents: 146 diff changeset	846 break;
149 37e2e0d06013 - Removed ProtectionDeclaration. aziz parents: 148 diff changeset	847 // Protection attributes
146 8180eb84e69c - Started implementation of parseAttributeSpecifier(). aziz parents: 145 diff changeset	848 case T.Private:
8180eb84e69c - Started implementation of parseAttributeSpecifier(). aziz parents: 145 diff changeset	849 case T.Package:
8180eb84e69c - Started implementation of parseAttributeSpecifier(). aziz parents: 145 diff changeset	850 case T.Protected:
8180eb84e69c - Started implementation of parseAttributeSpecifier(). aziz parents: 145 diff changeset	851 case T.Public:
148 e3e4d3314166 - Implemented parsing protection attributes. aziz parents: 147 diff changeset	852 case T.Export:
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	853 auto tok = token.type;
150 753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	854 nT();
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	855 decl = new AttributeDeclaration(tok, parseDeclarationsBlock());
149 37e2e0d06013 - Removed ProtectionDeclaration. aziz parents: 148 diff changeset	856 break;
146 8180eb84e69c - Started implementation of parseAttributeSpecifier(). aziz parents: 145 diff changeset	857 default:
8180eb84e69c - Started implementation of parseAttributeSpecifier(). aziz parents: 145 diff changeset	858 assert(0);
8180eb84e69c - Started implementation of parseAttributeSpecifier(). aziz parents: 145 diff changeset	859 }
8180eb84e69c - Started implementation of parseAttributeSpecifier(). aziz parents: 145 diff changeset	860 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	861 }
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	862
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	863 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	864 {
107 722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	865 assert(token.type == T.Import \|\| token.type == T.Static);
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	866
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	867 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	868
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	869 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	870 {
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	871 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	872 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	873 }
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	874
429 052cbacb1642 Fix: removed infinite loop when parsing static imports. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 424 diff changeset	875 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	876
364 1059295c2727 - Every command module has an execute method now. aziz parents: 359 diff changeset	877 ModuleFQN[] moduleFQNs;
263 ebcf7941f1db - Changed some string types to Token. aziz* parents: 262 diff changeset	878 Token*[] moduleAliases;
ebcf7941f1db - Changed some string types to Token. aziz* parents: 262 diff changeset	879 Token*[] bindNames;
ebcf7941f1db - Changed some string types to Token. aziz* parents: 262 diff changeset	880 Token*[] bindAliases;
114 83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	881
115 cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier(). aziz parents: 114 diff changeset	882 nT(); // Skip import keyword.
298 dc8bed242db5 - Fixed parsing ImportDeclaration. aziz parents: 297 diff changeset	883 while (1)
114 83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	884 {
364 1059295c2727 - Every command module has an execute method now. aziz parents: 359 diff changeset	885 ModuleFQN moduleFQN;
263 ebcf7941f1db - Changed some string types to Token. aziz* parents: 262 diff changeset	886 Token* moduleAlias;
ebcf7941f1db - Changed some string types to Token. aziz* parents: 262 diff changeset	887
ebcf7941f1db - Changed some string types to Token. aziz* parents: 262 diff changeset	888 moduleAlias = requireId();
115 cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier(). aziz parents: 114 diff changeset	889
cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier(). aziz parents: 114 diff changeset	890 // AliasName = ModuleName
cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier(). aziz parents: 114 diff changeset	891 if (token.type == T.Assign)
114 83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	892 {
83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	893 nT();
364 1059295c2727 - Every command module has an execute method now. aziz parents: 359 diff changeset	894 moduleFQN ~= requireId();
114 83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	895 }
115 cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier(). aziz parents: 114 diff changeset	896 else // import Identifier [^=]
114 83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	897 {
364 1059295c2727 - Every command module has an execute method now. aziz parents: 359 diff changeset	898 moduleFQN ~= moduleAlias;
114 83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	899 moduleAlias = null;
83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	900 }
115 cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier(). aziz parents: 114 diff changeset	901
298 dc8bed242db5 - Fixed parsing ImportDeclaration. aziz parents: 297 diff changeset	902 // Identifier(.Identifier)*
114 83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	903 while (token.type == T.Dot)
83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	904 {
83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	905 nT();
364 1059295c2727 - Every command module has an execute method now. aziz parents: 359 diff changeset	906 moduleFQN ~= requireId();
114 83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	907 }
83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	908
83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	909 // Push identifiers.
364 1059295c2727 - Every command module has an execute method now. aziz parents: 359 diff changeset	910 moduleFQNs ~= moduleFQN;
114 83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	911 moduleAliases ~= moduleAlias;
83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	912
298 dc8bed242db5 - Fixed parsing ImportDeclaration. aziz parents: 297 diff changeset	913 if (token.type != T.Comma)
dc8bed242db5 - Fixed parsing ImportDeclaration. aziz parents: 297 diff changeset	914 break;
dc8bed242db5 - Fixed parsing ImportDeclaration. aziz parents: 297 diff changeset	915 nT();
dc8bed242db5 - Fixed parsing ImportDeclaration. aziz parents: 297 diff changeset	916 }
dc8bed242db5 - Fixed parsing ImportDeclaration. aziz parents: 297 diff changeset	917
dc8bed242db5 - Fixed parsing ImportDeclaration. aziz parents: 297 diff changeset	918 if (token.type == T.Colon)
dc8bed242db5 - Fixed parsing ImportDeclaration. aziz parents: 297 diff changeset	919 {
dc8bed242db5 - Fixed parsing ImportDeclaration. aziz parents: 297 diff changeset	920 // BindAlias = BindName(, BindAlias = BindName)*;
dc8bed242db5 - Fixed parsing ImportDeclaration. aziz parents: 297 diff changeset	921 // BindName(, BindName)*;
dc8bed242db5 - Fixed parsing ImportDeclaration. aziz parents: 297 diff changeset	922 Token* bindName, bindAlias;
320 0ce14640eb04 - Fix in parseImportDeclaration(): rewrote while loop and removed a call to nT(). aziz parents: 319 diff changeset	923 do
114 83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	924 {
298 dc8bed242db5 - Fixed parsing ImportDeclaration. aziz parents: 297 diff changeset	925 nT();
dc8bed242db5 - Fixed parsing ImportDeclaration. aziz parents: 297 diff changeset	926 bindAlias = requireId();
dc8bed242db5 - Fixed parsing ImportDeclaration. aziz parents: 297 diff changeset	927
dc8bed242db5 - Fixed parsing ImportDeclaration. aziz parents: 297 diff changeset	928 if (token.type == T.Assign)
114 83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	929 {
83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	930 nT();
298 dc8bed242db5 - Fixed parsing ImportDeclaration. aziz parents: 297 diff changeset	931 bindName = requireId();
dc8bed242db5 - Fixed parsing ImportDeclaration. aziz parents: 297 diff changeset	932 }
dc8bed242db5 - Fixed parsing ImportDeclaration. aziz parents: 297 diff changeset	933 else
dc8bed242db5 - Fixed parsing ImportDeclaration. aziz parents: 297 diff changeset	934 {
dc8bed242db5 - Fixed parsing ImportDeclaration. aziz parents: 297 diff changeset	935 bindName = bindAlias;
dc8bed242db5 - Fixed parsing ImportDeclaration. aziz parents: 297 diff changeset	936 bindAlias = null;
dc8bed242db5 - Fixed parsing ImportDeclaration. aziz parents: 297 diff changeset	937 }
dc8bed242db5 - Fixed parsing ImportDeclaration. aziz parents: 297 diff changeset	938
dc8bed242db5 - Fixed parsing ImportDeclaration. aziz parents: 297 diff changeset	939 // Push identifiers.
dc8bed242db5 - Fixed parsing ImportDeclaration. aziz parents: 297 diff changeset	940 bindNames ~= bindName;
dc8bed242db5 - Fixed parsing ImportDeclaration. aziz parents: 297 diff changeset	941 bindAliases ~= bindAlias;
320 0ce14640eb04 - Fix in parseImportDeclaration(): rewrote while loop and removed a call to nT(). aziz parents: 319 diff changeset	942 } while (token.type == T.Comma)
298 dc8bed242db5 - Fixed parsing ImportDeclaration. aziz parents: 297 diff changeset	943 }
dc8bed242db5 - Fixed parsing ImportDeclaration. aziz parents: 297 diff changeset	944
114 83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	945 require(T.Semicolon);
83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	946
366 dcbd3bf9bf74 - Added command importgraph/igraph to main.d. aziz parents: 364 diff changeset	947 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	948 }
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	949
107 722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	950 Declaration parseEnumDeclaration()
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	951 {
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	952 assert(token.type == T.Enum);
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	953
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	954 Token* enumName;
107 722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	955 Type baseType;
406 e242f0ee2d27 Added class EnumMember. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 405 diff changeset	956 EnumMember[] members;
126 0f0e7352e91d - Renamed member hasDefinition of class Declaration to hasBody. aziz parents: 125 diff changeset	957 bool hasBody;
107 722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	958
115 cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier(). aziz parents: 114 diff changeset	959 nT(); // Skip enum keyword.
231 6846138a0e24 - Fixed parseEnumDeclaration(). aziz parents: 230 diff changeset	960
6846138a0e24 - Fixed parseEnumDeclaration(). aziz parents: 230 diff changeset	961 if (token.type == T.Identifier)
6846138a0e24 - Fixed parseEnumDeclaration(). aziz parents: 230 diff changeset	962 {
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	963 enumName = token;
231 6846138a0e24 - Fixed parseEnumDeclaration(). aziz parents: 230 diff changeset	964 nT();
6846138a0e24 - Fixed parseEnumDeclaration(). aziz parents: 230 diff changeset	965 }
107 722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	966
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	967 if (token.type == T.Colon)
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	968 {
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	969 nT();
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	970 baseType = parseBasicType();
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	971 }
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	972
115 cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier(). aziz parents: 114 diff changeset	973 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	974 {
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	975 if (enumName is null)
231 6846138a0e24 - Fixed parseEnumDeclaration(). aziz parents: 230 diff changeset	976 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	977 nT();
cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier(). aziz parents: 114 diff changeset	978 }
cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier(). aziz parents: 114 diff changeset	979 else if (token.type == T.LBrace)
107 722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	980 {
126 0f0e7352e91d - Renamed member hasDefinition of class Declaration to hasBody. aziz parents: 125 diff changeset	981 hasBody = true;
398 f7bb892d64c2 Fixed Parser.parseEnumDeclaration(): empty enums are allowed now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 396 diff changeset	982 nT(); // Skip {
f7bb892d64c2 Fixed Parser.parseEnumDeclaration(): empty enums are allowed now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 396 diff changeset	983 while (token.type != T.RBrace)
107 722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	984 {
406 e242f0ee2d27 Added class EnumMember. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 405 diff changeset	985 auto begin = token;
e242f0ee2d27 Added class EnumMember. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 405 diff changeset	986 auto memberName = requireId();
e242f0ee2d27 Added class EnumMember. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 405 diff changeset	987 Expression value;
107 722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	988
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	989 if (token.type == T.Assign)
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	990 {
115 cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier(). aziz parents: 114 diff changeset	991 nT();
406 e242f0ee2d27 Added class EnumMember. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 405 diff changeset	992 value = parseAssignExpression();
107 722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	993 }
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	994 else
406 e242f0ee2d27 Added class EnumMember. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 405 diff changeset	995 value = null;
e242f0ee2d27 Added class EnumMember. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 405 diff changeset	996
e242f0ee2d27 Added class EnumMember. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 405 diff changeset	997 members ~= set(new EnumMember(memberName, value), begin);
107 722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	998
398 f7bb892d64c2 Fixed Parser.parseEnumDeclaration(): empty enums are allowed now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 396 diff changeset	999 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	1000 break;
398 f7bb892d64c2 Fixed Parser.parseEnumDeclaration(): empty enums are allowed now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 396 diff changeset	1001 nT(); // Skip ,
f7bb892d64c2 Fixed Parser.parseEnumDeclaration(): empty enums are allowed now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 396 diff changeset	1002 }
f7bb892d64c2 Fixed Parser.parseEnumDeclaration(): empty enums are allowed now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 396 diff changeset	1003 require(T.RBrace);
107 722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	1004 }
231 6846138a0e24 - Fixed parseEnumDeclaration(). aziz parents: 230 diff changeset	1005 else
6846138a0e24 - Fixed parseEnumDeclaration(). aziz parents: 230 diff changeset	1006 error(MID.ExpectedButFound, "enum declaration", token.srcText);
107 722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	1007
406 e242f0ee2d27 Added class EnumMember. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 405 diff changeset	1008 return new EnumDeclaration(enumName, baseType, members, hasBody);
107 722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	1009 }
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	1010
109 d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1011 Declaration parseClassDeclaration()
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1012 {
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1013 assert(token.type == T.Class);
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1014
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	1015 Token* className;
258 112a57f433f2 - Created class TemplateParameters. aziz parents: 257 diff changeset	1016 TemplateParameters tparams;
109 d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1017 BaseClass[] bases;
305 df237b3b5f09 - Added class Declarations. aziz parents: 304 diff changeset	1018 Declarations decls;
126 0f0e7352e91d - Renamed member hasDefinition of class Declaration to hasBody. aziz parents: 125 diff changeset	1019 bool hasBody;
109 d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1020
115 cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier(). aziz parents: 114 diff changeset	1021 nT(); // Skip class keyword.
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	1022 className = requireId();
109 d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1023
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1024 if (token.type == T.LParen)
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1025 {
195 37c2ffd649c4 - Parsing template parameter list for class, interface, struct and union declarations. aziz parents: 194 diff changeset	1026 tparams = parseTemplateParameterList();
109 d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1027 }
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1028
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1029 if (token.type == T.Colon)
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1030 bases = parseBaseClasses();
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1031
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1032 if (token.type == T.Semicolon)
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1033 {
405 e2529923a0cb Added two error messages. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 404 diff changeset	1034 if (bases.length != 0)
e2529923a0cb Added two error messages. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 404 diff changeset	1035 error(MID.BaseClassInForwardDeclaration);
109 d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1036 nT();
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1037 }
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1038 else if (token.type == T.LBrace)
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1039 {
126 0f0e7352e91d - Renamed member hasDefinition of class Declaration to hasBody. aziz parents: 125 diff changeset	1040 hasBody = true;
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	1041 decls = parseDeclarationDefinitionsBlock();
109 d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1042 }
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1043 else
124 d4c4cea6ee7f - Renamed method errorIfNot() to expected(). aziz parents: 123 diff changeset	1044 expected(T.LBrace); // TODO: better error msg
109 d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1045
195 37c2ffd649c4 - Parsing template parameter list for class, interface, struct and union declarations. aziz parents: 194 diff changeset	1046 return new ClassDeclaration(className, tparams, bases, decls, hasBody);
109 d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1047 }
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1048
144 cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon. aziz parents: 143 diff changeset	1049 BaseClass[] parseBaseClasses(bool colonLeadsOff = true)
109 d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1050 {
144 cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon. aziz parents: 143 diff changeset	1051 if (colonLeadsOff)
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon. aziz parents: 143 diff changeset	1052 {
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon. aziz parents: 143 diff changeset	1053 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	1054 nT(); // Skip colon
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon. aziz parents: 143 diff changeset	1055 }
109 d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1056
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1057 BaseClass[] bases;
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1058
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1059 while (1)
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1060 {
117 79857de26e86 - Moved class Parameter to module Types. Added struct Parameters. aziz parents: 116 diff changeset	1061 Protection prot = Protection.Public;
109 d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1062 switch (token.type)
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1063 {
204 082f30904456 - Allowing 'typeof' in BaseClassList. aziz parents: 203 diff changeset	1064 case T.Identifier, T.Dot, T.Typeof: goto LparseBasicType;
109 d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1065 case T.Private: prot = Protection.Private; break;
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1066 case T.Protected: prot = Protection.Protected; break;
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1067 case T.Package: prot = Protection.Package; break;
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1068 case T.Public: /prot = Protection.Public;/ break;
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1069 default:
405 e2529923a0cb Added two error messages. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 404 diff changeset	1070 error(MID.ExpectedBaseClasses, token.srcText);
109 d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1071 return bases;
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1072 }
158 759f437313f9 - Moved enum Protection and class BaseClass to module Types. aziz parents: 157 diff changeset	1073 nT(); // Skip protection attribute.
759f437313f9 - Moved enum Protection and class BaseClass to module Types. aziz parents: 157 diff changeset	1074 LparseBasicType:
759f437313f9 - Moved enum Protection and class BaseClass to module Types. aziz parents: 157 diff changeset	1075 auto type = parseBasicType();
759f437313f9 - Moved enum Protection and class BaseClass to module Types. aziz parents: 157 diff changeset	1076 //if (type.tid != TID.DotList)
759f437313f9 - Moved enum Protection and class BaseClass to module Types. aziz parents: 157 diff changeset	1077 // TODO: issue error msg. base classes can only be one or more identifiers or template instances separated by dots.
759f437313f9 - Moved enum Protection and class BaseClass to module Types. aziz parents: 157 diff changeset	1078 bases ~= new BaseClass(prot, type);
109 d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1079 if (token.type != T.Comma)
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1080 break;
396 0a4619735ce9 Applied fixes to Lexer, Parser and other classes. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 391 diff changeset	1081 nT();
109 d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1082 }
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1083 return bases;
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1084 }
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1085
112 004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	1086 Declaration parseInterfaceDeclaration()
004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	1087 {
004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	1088 assert(token.type == T.Interface);
004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	1089
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	1090 Token* name;
258 112a57f433f2 - Created class TemplateParameters. aziz parents: 257 diff changeset	1091 TemplateParameters tparams;
112 004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	1092 BaseClass[] bases;
305 df237b3b5f09 - Added class Declarations. aziz parents: 304 diff changeset	1093 Declarations decls;
126 0f0e7352e91d - Renamed member hasDefinition of class Declaration to hasBody. aziz parents: 125 diff changeset	1094 bool hasBody;
112 004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	1095
115 cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier(). aziz parents: 114 diff changeset	1096 nT(); // Skip interface keyword.
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	1097 name = requireId();
112 004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	1098
004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	1099 if (token.type == T.LParen)
004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	1100 {
195 37c2ffd649c4 - Parsing template parameter list for class, interface, struct and union declarations. aziz parents: 194 diff changeset	1101 tparams = parseTemplateParameterList();
112 004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	1102 }
004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	1103
004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	1104 if (token.type == T.Colon)
004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	1105 bases = parseBaseClasses();
004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	1106
004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	1107 if (token.type == T.Semicolon)
004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	1108 {
405 e2529923a0cb Added two error messages. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 404 diff changeset	1109 if (bases.length != 0)
e2529923a0cb Added two error messages. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 404 diff changeset	1110 error(MID.BaseClassInForwardDeclaration);
112 004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	1111 nT();
004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	1112 }
004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	1113 else if (token.type == T.LBrace)
004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	1114 {
126 0f0e7352e91d - Renamed member hasDefinition of class Declaration to hasBody. aziz parents: 125 diff changeset	1115 hasBody = true;
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	1116 decls = parseDeclarationDefinitionsBlock();
112 004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	1117 }
004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	1118 else
124 d4c4cea6ee7f - Renamed method errorIfNot() to expected(). aziz parents: 123 diff changeset	1119 expected(T.LBrace); // TODO: better error msg
112 004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	1120
195 37c2ffd649c4 - Parsing template parameter list for class, interface, struct and union declarations. aziz parents: 194 diff changeset	1121 return new InterfaceDeclaration(name, tparams, bases, decls, hasBody);
112 004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	1122 }
004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	1123
113 20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	1124 Declaration parseAggregateDeclaration()
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	1125 {
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	1126 assert(token.type == T.Struct \|\| token.type == T.Union);
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	1127
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	1128 TOK tok = token.type;
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	1129
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	1130 Token* name;
258 112a57f433f2 - Created class TemplateParameters. aziz parents: 257 diff changeset	1131 TemplateParameters tparams;
305 df237b3b5f09 - Added class Declarations. aziz parents: 304 diff changeset	1132 Declarations decls;
126 0f0e7352e91d - Renamed member hasDefinition of class Declaration to hasBody. aziz parents: 125 diff changeset	1133 bool hasBody;
113 20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	1134
115 cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier(). aziz parents: 114 diff changeset	1135 nT(); // Skip struct or union keyword.
cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier(). aziz parents: 114 diff changeset	1136 // name is optional.
113 20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	1137 if (token.type == T.Identifier)
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	1138 {
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	1139 name = token;
113 20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	1140 nT();
115 cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier(). aziz parents: 114 diff changeset	1141 if (token.type == T.LParen)
cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier(). aziz parents: 114 diff changeset	1142 {
195 37c2ffd649c4 - Parsing template parameter list for class, interface, struct and union declarations. aziz parents: 194 diff changeset	1143 tparams = parseTemplateParameterList();
115 cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier(). aziz parents: 114 diff changeset	1144 }
113 20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	1145 }
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	1146
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	1147 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	1148 {
cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier(). aziz parents: 114 diff changeset	1149 //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	1150 // TODO: error: forward declarations must have a name.
113 20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	1151 nT();
115 cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier(). aziz parents: 114 diff changeset	1152 }
113 20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	1153 else if (token.type == T.LBrace)
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	1154 {
126 0f0e7352e91d - Renamed member hasDefinition of class Declaration to hasBody. aziz parents: 125 diff changeset	1155 hasBody = true;
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	1156 decls = parseDeclarationDefinitionsBlock();
113 20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	1157 }
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	1158 else
124 d4c4cea6ee7f - Renamed method errorIfNot() to expected(). aziz parents: 123 diff changeset	1159 expected(T.LBrace); // TODO: better error msg
113 20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	1160
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	1161 if (tok == T.Struct)
195 37c2ffd649c4 - Parsing template parameter list for class, interface, struct and union declarations. aziz parents: 194 diff changeset	1162 return new StructDeclaration(name, tparams, decls, hasBody);
113 20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	1163 else
195 37c2ffd649c4 - Parsing template parameter list for class, interface, struct and union declarations. aziz parents: 194 diff changeset	1164 return new UnionDeclaration(name, tparams, decls, hasBody);
113 20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	1165 }
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	1166
117 79857de26e86 - Moved class Parameter to module Types. Added struct Parameters. aziz parents: 116 diff changeset	1167 Declaration parseConstructorDeclaration()
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters. aziz parents: 116 diff changeset	1168 {
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters. aziz parents: 116 diff changeset	1169 assert(token.type == T.This);
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters. aziz parents: 116 diff changeset	1170 nT(); // Skip 'this' keyword.
143 e760d7552f66 - Renamed parseArgumentList() to parseArguments(). aziz parents: 141 diff changeset	1171 auto parameters = parseParameterList();
267 f3dfa6208ed3 - Removed parameter func from parseFunctionBody(). Creating new FunctionBody inside the method. aziz parents: 266 diff changeset	1172 auto funcBody = parseFunctionBody();
197 ff32eb87300e - Using parseFunctionBody() for Constructor-,Destructor-,StaticConstructor-,StaticDestructor-,Invariant-,Unittest-,New- and DeleteDeclaration. aziz parents: 196 diff changeset	1173 return new ConstructorDeclaration(parameters, funcBody);
117 79857de26e86 - Moved class Parameter to module Types. Added struct Parameters. aziz parents: 116 diff changeset	1174 }
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters. aziz parents: 116 diff changeset	1175
118 379f33cbd521 - Added parseDestructorDeclaration() and DestructorDeclaration class. aziz parents: 117 diff changeset	1176 Declaration parseDestructorDeclaration()
379f33cbd521 - Added parseDestructorDeclaration() and DestructorDeclaration class. aziz parents: 117 diff changeset	1177 {
379f33cbd521 - Added parseDestructorDeclaration() and DestructorDeclaration class. aziz parents: 117 diff changeset	1178 assert(token.type == T.Tilde);
379f33cbd521 - Added parseDestructorDeclaration() and DestructorDeclaration class. aziz parents: 117 diff changeset	1179 nT(); // Skip ~
379f33cbd521 - Added parseDestructorDeclaration() and DestructorDeclaration class. aziz parents: 117 diff changeset	1180 require(T.This);
379f33cbd521 - Added parseDestructorDeclaration() and DestructorDeclaration class. aziz parents: 117 diff changeset	1181 require(T.LParen);
379f33cbd521 - Added parseDestructorDeclaration() and DestructorDeclaration class. aziz parents: 117 diff changeset	1182 require(T.RParen);
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 DestructorDeclaration(funcBody);
118 379f33cbd521 - Added parseDestructorDeclaration() and DestructorDeclaration class. aziz parents: 117 diff changeset	1185 }
379f33cbd521 - Added parseDestructorDeclaration() and DestructorDeclaration class. aziz parents: 117 diff changeset	1186
119 363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	1187 Declaration parseStaticConstructorDeclaration()
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	1188 {
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	1189 assert(token.type == T.Static);
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	1190 nT(); // Skip static keyword.
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	1191 nT(); // Skip 'this' keyword.
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	1192 require(T.LParen);
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 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 StaticConstructorDeclaration(funcBody);
119 363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	1196 }
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	1197
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	1198 Declaration parseStaticDestructorDeclaration()
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 ~
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	1203 require(T.This);
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	1204 require(T.LParen);
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	1205 require(T.RParen);
267 f3dfa6208ed3 - Removed parameter func from parseFunctionBody(). Creating new FunctionBody inside the method. aziz parents: 266 diff changeset	1206 auto funcBody = parseFunctionBody();
197 ff32eb87300e - Using parseFunctionBody() for Constructor-,Destructor-,StaticConstructor-,StaticDestructor-,Invariant-,Unittest-,New- and DeleteDeclaration. aziz parents: 196 diff changeset	1207 return new StaticDestructorDeclaration(funcBody);
119 363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	1208 }
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	1209
120 e5329dac0405 - Added parseInvariantDeclaration(). aziz parents: 119 diff changeset	1210 Declaration parseInvariantDeclaration()
e5329dac0405 - Added parseInvariantDeclaration(). aziz parents: 119 diff changeset	1211 {
e5329dac0405 - Added parseInvariantDeclaration(). aziz parents: 119 diff changeset	1212 assert(token.type == T.Invariant);
e5329dac0405 - Added parseInvariantDeclaration(). aziz parents: 119 diff changeset	1213 nT(); // Skip invariant keyword.
e5329dac0405 - Added parseInvariantDeclaration(). aziz parents: 119 diff changeset	1214 // Optional () for getting ready porting to D 2.0
e5329dac0405 - Added parseInvariantDeclaration(). aziz parents: 119 diff changeset	1215 if (token.type == T.LParen)
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	1216 requireNext(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 InvariantDeclaration(funcBody);
120 e5329dac0405 - Added parseInvariantDeclaration(). aziz parents: 119 diff changeset	1219 }
e5329dac0405 - Added parseInvariantDeclaration(). aziz parents: 119 diff changeset	1220
121 030933c6b5f0 - Added parseUnittestDeclaration(). aziz parents: 120 diff changeset	1221 Declaration parseUnittestDeclaration()
030933c6b5f0 - Added parseUnittestDeclaration(). aziz parents: 120 diff changeset	1222 {
030933c6b5f0 - Added parseUnittestDeclaration(). aziz parents: 120 diff changeset	1223 assert(token.type == T.Unittest);
030933c6b5f0 - Added parseUnittestDeclaration(). aziz parents: 120 diff changeset	1224
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	1225 nT(); // Skip unittest keyword.
267 f3dfa6208ed3 - Removed parameter func from parseFunctionBody(). Creating new FunctionBody inside the method. aziz parents: 266 diff changeset	1226 auto funcBody = parseFunctionBody();
197 ff32eb87300e - Using parseFunctionBody() for Constructor-,Destructor-,StaticConstructor-,StaticDestructor-,Invariant-,Unittest-,New- and DeleteDeclaration. aziz parents: 196 diff changeset	1227 return new UnittestDeclaration(funcBody);
121 030933c6b5f0 - Added parseUnittestDeclaration(). aziz parents: 120 diff changeset	1228 }
030933c6b5f0 - Added parseUnittestDeclaration(). aziz parents: 120 diff changeset	1229
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	1230 Declaration parseDebugDeclaration()
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	1231 {
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	1232 assert(token.type == T.Debug);
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	1233
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	1234 nT(); // Skip debug keyword.
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	1235
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	1236 Token* spec; // debug = Integer ;
50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	1237 // debug = Identifier ;
50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	1238 Token* cond; // debug ( Integer )
50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	1239 // debug ( Identifier )
305 df237b3b5f09 - Added class Declarations. aziz parents: 304 diff changeset	1240 Declaration decls, elseDecls;
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	1241
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	1242 void parseIdentOrInt(ref Token* tok)
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	1243 {
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	1244 nT();
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	1245 if (token.type == T.Int32 \|\|
50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	1246 token.type == T.Identifier)
50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	1247 {
50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	1248 tok = token;
50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	1249 nT();
50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	1250 }
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	1251 else
124 d4c4cea6ee7f - Renamed method errorIfNot() to expected(). aziz parents: 123 diff changeset	1252 expected(T.Identifier); // TODO: better error msg
123 0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1253 }
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1254
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1255 if (token.type == T.Assign)
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1256 {
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	1257 parseIdentOrInt(spec);
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	1258 require(T.Semicolon);
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	1259 }
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	1260 else
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	1261 {
123 0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1262 // Condition:
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1263 // Integer
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1264 // Identifier
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1265 // ( Condition )
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	1266 if (token.type == T.LParen)
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	1267 {
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	1268 parseIdentOrInt(cond);
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	1269 require(T.RParen);
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	1270 }
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	1271
123 0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1272 // debug DeclarationsBlock
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1273 // debug ( Condition ) DeclarationsBlock
404 fe46b5ea7a18 Added method parseDeclarationsBlockNoColon(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 400 diff changeset	1274 decls = parseDeclarationsBlockNoColon();
123 0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1275
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1276 // else DeclarationsBlock
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	1277 if (token.type == T.Else)
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	1278 {
123 0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1279 nT();
404 fe46b5ea7a18 Added method parseDeclarationsBlockNoColon(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 400 diff changeset	1280 elseDecls = parseDeclarationsBlockNoColon();
123 0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1281 }
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1282 }
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1283
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	1284 return new DebugDeclaration(spec, cond, decls, elseDecls);
123 0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1285 }
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1286
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1287 Declaration parseVersionDeclaration()
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1288 {
146 8180eb84e69c - Started implementation of parseAttributeSpecifier(). aziz parents: 145 diff changeset	1289 assert(token.type == T.Version);
123 0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1290
146 8180eb84e69c - Started implementation of parseAttributeSpecifier(). aziz parents: 145 diff changeset	1291 nT(); // Skip version keyword.
123 0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1292
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	1293 Token* spec; // version = Integer ;
50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	1294 // version = Identifier ;
50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	1295 Token* cond; // version ( Integer )
50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	1296 // version ( Identifier )
305 df237b3b5f09 - Added class Declarations. aziz parents: 304 diff changeset	1297 Declaration decls, elseDecls;
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	1298
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	1299 void parseIdentOrInt(ref Token* tok)
123 0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1300 {
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	1301 if (token.type == T.Int32 \|\|
50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	1302 token.type == T.Identifier)
50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	1303 {
50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	1304 tok = token;
50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	1305 nT();
50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	1306 }
123 0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1307 else
124 d4c4cea6ee7f - Renamed method errorIfNot() to expected(). aziz parents: 123 diff changeset	1308 expected(T.Identifier); // TODO: better error msg
123 0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1309 }
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1310
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1311 if (token.type == T.Assign)
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1312 {
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	1313 nT();
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	1314 parseIdentOrInt(spec);
123 0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1315 require(T.Semicolon);
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1316 }
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1317 else
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1318 {
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1319 // Condition:
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1320 // Integer
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1321 // Identifier
146 8180eb84e69c - Started implementation of parseAttributeSpecifier(). aziz parents: 145 diff changeset	1322
123 0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1323 // ( Condition )
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1324 require(T.LParen);
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	1325 parseIdentOrInt(cond);
123 0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1326 require(T.RParen);
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1327
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1328 // version ( Condition ) DeclarationsBlock
404 fe46b5ea7a18 Added method parseDeclarationsBlockNoColon(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 400 diff changeset	1329 decls = parseDeclarationsBlockNoColon();
123 0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1330
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1331 // else DeclarationsBlock
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1332 if (token.type == T.Else)
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1333 {
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1334 nT();
404 fe46b5ea7a18 Added method parseDeclarationsBlockNoColon(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 400 diff changeset	1335 elseDecls = parseDeclarationsBlockNoColon();
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	1336 }
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	1337 }
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	1338
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	1339 return new VersionDeclaration(spec, cond, decls, elseDecls);
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	1340 }
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	1341
125 240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	1342 Declaration parseStaticIfDeclaration()
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	1343 {
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	1344 assert(token.type == T.Static);
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	1345
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	1346 nT(); // Skip static keyword.
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	1347 nT(); // Skip if keyword.
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	1348
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	1349 Expression condition;
305 df237b3b5f09 - Added class Declarations. aziz parents: 304 diff changeset	1350 Declaration ifDecls, elseDecls;
125 240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	1351
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	1352 require(T.LParen);
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	1353 condition = parseAssignExpression();
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	1354 require(T.RParen);
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	1355
404 fe46b5ea7a18 Added method parseDeclarationsBlockNoColon(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 400 diff changeset	1356 ifDecls = parseDeclarationsBlockNoColon();
125 240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	1357
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	1358 if (token.type == T.Else)
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 nT();
404 fe46b5ea7a18 Added method parseDeclarationsBlockNoColon(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 400 diff changeset	1361 elseDecls = parseDeclarationsBlockNoColon();
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
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	1364 return new StaticIfDeclaration(condition, ifDecls, elseDecls);
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	1365 }
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	1366
127 cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration. aziz parents: 126 diff changeset	1367 Declaration parseStaticAssertDeclaration()
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration. aziz parents: 126 diff changeset	1368 {
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration. aziz parents: 126 diff changeset	1369 assert(token.type == T.Static);
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration. aziz parents: 126 diff changeset	1370
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration. aziz parents: 126 diff changeset	1371 nT(); // Skip static keyword.
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration. aziz parents: 126 diff changeset	1372 nT(); // Skip assert keyword.
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration. aziz parents: 126 diff changeset	1373
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration. aziz parents: 126 diff changeset	1374 Expression condition, message;
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration. aziz parents: 126 diff changeset	1375
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration. aziz parents: 126 diff changeset	1376 require(T.LParen);
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration. aziz parents: 126 diff changeset	1377
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration. aziz parents: 126 diff changeset	1378 condition = parseAssignExpression();
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 if (token.type == T.Comma)
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();
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration. aziz parents: 126 diff changeset	1383 message = parseAssignExpression();
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
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration. aziz parents: 126 diff changeset	1386 require(T.RParen);
128 e02b87281b4e - Static asserts have to end with a semicolon. aziz parents: 127 diff changeset	1387 require(T.Semicolon);
127 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 return new StaticAssertDeclaration(condition, message);
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
140 64d7186b087c - Implemented parseTemplateParameters(). aziz parents: 139 diff changeset	1392 Declaration parseTemplateDeclaration()
64d7186b087c - Implemented parseTemplateParameters(). aziz parents: 139 diff changeset	1393 {
64d7186b087c - Implemented parseTemplateParameters(). aziz parents: 139 diff changeset	1394 assert(token.type == T.Template);
64d7186b087c - Implemented parseTemplateParameters(). aziz parents: 139 diff changeset	1395 nT(); // Skip template keyword.
265 3a2a0a63c638 - Changed some string types to Token. aziz* parents: 264 diff changeset	1396 auto templateName = requireId();
143 e760d7552f66 - Renamed parseArgumentList() to parseArguments(). aziz parents: 141 diff changeset	1397 auto templateParams = parseTemplateParameterList();
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	1398 auto decls = parseDeclarationDefinitionsBlock();
140 64d7186b087c - Implemented parseTemplateParameters(). aziz parents: 139 diff changeset	1399 return new TemplateDeclaration(templateName, templateParams, decls);
64d7186b087c - Implemented parseTemplateParameters(). aziz parents: 139 diff changeset	1400 }
64d7186b087c - Implemented parseTemplateParameters(). aziz parents: 139 diff changeset	1401
141 7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration(). aziz parents: 140 diff changeset	1402 Declaration parseNewDeclaration()
7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration(). aziz parents: 140 diff changeset	1403 {
7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration(). aziz parents: 140 diff changeset	1404 assert(token.type == T.New);
7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration(). aziz parents: 140 diff changeset	1405 nT(); // Skip new keyword.
143 e760d7552f66 - Renamed parseArgumentList() to parseArguments(). aziz parents: 141 diff changeset	1406 auto parameters = parseParameterList();
267 f3dfa6208ed3 - Removed parameter func from parseFunctionBody(). Creating new FunctionBody inside the method. aziz parents: 266 diff changeset	1407 auto funcBody = parseFunctionBody();
197 ff32eb87300e - Using parseFunctionBody() for Constructor-,Destructor-,StaticConstructor-,StaticDestructor-,Invariant-,Unittest-,New- and DeleteDeclaration. aziz parents: 196 diff changeset	1408 return new NewDeclaration(parameters, funcBody);
141 7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration(). aziz parents: 140 diff changeset	1409 }
7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration(). aziz parents: 140 diff changeset	1410
7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration(). aziz parents: 140 diff changeset	1411 Declaration parseDeleteDeclaration()
7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration(). aziz parents: 140 diff changeset	1412 {
7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration(). aziz parents: 140 diff changeset	1413 assert(token.type == T.Delete);
7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration(). aziz parents: 140 diff changeset	1414 nT(); // Skip delete keyword.
143 e760d7552f66 - Renamed parseArgumentList() to parseArguments(). aziz parents: 141 diff changeset	1415 auto parameters = parseParameterList();
197 ff32eb87300e - Using parseFunctionBody() for Constructor-,Destructor-,StaticConstructor-,StaticDestructor-,Invariant-,Unittest-,New- and DeleteDeclaration. aziz parents: 196 diff changeset	1416 // 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	1417 auto funcBody = parseFunctionBody();
197 ff32eb87300e - Using parseFunctionBody() for Constructor-,Destructor-,StaticConstructor-,StaticDestructor-,Invariant-,Unittest-,New- and DeleteDeclaration. aziz parents: 196 diff changeset	1418 return new DeleteDeclaration(parameters, funcBody);
141 7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration(). aziz parents: 140 diff changeset	1419 }
7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration(). aziz parents: 140 diff changeset	1420
154 0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1421 /+
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1422 DotListExpression:
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1423 . DotListItems
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1424 DotListItems
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1425 Typeof
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1426 Typeof . DotListItems
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1427 DotListItems:
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1428 DotListItem
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1429 DotListItem . DotListItems
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1430 DotListItem:
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1431 Identifier
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1432 TemplateInstance
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1433 NewExpression
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1434 TemplateInstance:
233 c2b601dcd57d - Added assert to parseDotListExpression(). aziz parents: 232 diff changeset	1435 Identifier !( TemplateArguments )
154 0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1436 +/
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1437 DotListExpression parseDotListExpression()
152 fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression. aziz parents: 151 diff changeset	1438 {
233 c2b601dcd57d - Added assert to parseDotListExpression(). aziz parents: 232 diff changeset	1439 assert(token.type == T.Identifier \|\| token.type == T.Dot \|\| token.type == T.Typeof);
152 fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression. aziz parents: 151 diff changeset	1440 Expression[] identList;
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression. aziz parents: 151 diff changeset	1441 if (token.type == T.Dot)
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression. aziz parents: 151 diff changeset	1442 {
252 788398655d24 - Changed some string types to Token. Adapted parser accordingly. aziz* parents: 251 diff changeset	1443 identList ~= new IdentifierExpression(token);
152 fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression. aziz parents: 151 diff changeset	1444 nT();
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression. aziz parents: 151 diff changeset	1445 }
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression. aziz parents: 151 diff changeset	1446 else if (token.type == T.Typeof)
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression. aziz parents: 151 diff changeset	1447 {
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression. aziz parents: 151 diff changeset	1448 requireNext(T.LParen);
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression. aziz parents: 151 diff changeset	1449 auto type = new TypeofType(parseExpression());
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression. aziz parents: 151 diff changeset	1450 require(T.RParen);
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression. aziz parents: 151 diff changeset	1451 identList ~= new TypeofExpression(type);
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression. aziz parents: 151 diff changeset	1452 if (token.type != T.Dot)
154 0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1453 goto Lreturn;
152 fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression. aziz parents: 151 diff changeset	1454 nT();
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression. aziz parents: 151 diff changeset	1455 }
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression. aziz parents: 151 diff changeset	1456
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression. aziz parents: 151 diff changeset	1457 while (1)
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression. aziz parents: 151 diff changeset	1458 {
321 ae7f48182cb1 - Added some calls to set(). aziz parents: 320 diff changeset	1459 auto begin2 = token;
252 788398655d24 - Changed some string types to Token. Adapted parser accordingly. aziz* parents: 251 diff changeset	1460 auto ident = requireId();
788398655d24 - Changed some string types to Token. Adapted parser accordingly. aziz* parents: 251 diff changeset	1461 Expression e;
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1462 if (token.type == T.Not && peekNext() == T.LParen) // Identifier !( TemplateArguments )
152 fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression. aziz parents: 151 diff changeset	1463 {
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression. aziz parents: 151 diff changeset	1464 nT(); // Skip !.
321 ae7f48182cb1 - Added some calls to set(). aziz parents: 320 diff changeset	1465 e = set(new TemplateInstanceExpression(ident, parseTemplateArguments()), begin2);
152 fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression. aziz parents: 151 diff changeset	1466 }
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression. aziz parents: 151 diff changeset	1467 else // Identifier
321 ae7f48182cb1 - Added some calls to set(). aziz parents: 320 diff changeset	1468 e = set(new IdentifierExpression(ident), begin2);
252 788398655d24 - Changed some string types to Token. Adapted parser accordingly. aziz* parents: 251 diff changeset	1469
788398655d24 - Changed some string types to Token. Adapted parser accordingly. aziz* parents: 251 diff changeset	1470 identList ~= e;
152 fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression. aziz parents: 151 diff changeset	1471
154 0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1472 LnewExpressionLoop:
152 fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression. aziz parents: 151 diff changeset	1473 if (token.type != T.Dot)
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression. aziz parents: 151 diff changeset	1474 break;
154 0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1475 nT(); // Skip dot.
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1476
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1477 if (token.type == T.New)
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1478 {
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1479 identList ~= parseNewExpression();
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1480 goto LnewExpressionLoop;
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1481 }
152 fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression. aziz parents: 151 diff changeset	1482 }
233 c2b601dcd57d - Added assert to parseDotListExpression(). aziz parents: 232 diff changeset	1483
154 0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1484 Lreturn:
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1485 return new DotListExpression(identList);
152 fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression. aziz parents: 151 diff changeset	1486 }
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression. aziz parents: 151 diff changeset	1487
154 0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1488 /+
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1489 DotListType:
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1490 . TypeItems
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1491 TypeItems
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1492 Typeof
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1493 Typeof . TypeItems
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1494 TypeItems:
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1495 TypeItem
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1496 TypeItem . TypeItems
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1497 TypeItem:
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1498 Identifier
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1499 TemplateInstance
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1500 TemplateInstance:
233 c2b601dcd57d - Added assert to parseDotListExpression(). aziz parents: 232 diff changeset	1501 Identifier !( TemplateArguments )
154 0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1502 +/
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1503 DotListType parseDotListType()
153 66790fc2c0a2 - Added method parseIdentifierListType(). aziz parents: 152 diff changeset	1504 {
484 265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	1505 auto begin = token;
153 66790fc2c0a2 - Added method parseIdentifierListType(). aziz parents: 152 diff changeset	1506 Type[] identList;
66790fc2c0a2 - Added method parseIdentifierListType(). aziz parents: 152 diff changeset	1507 if (token.type == T.Dot)
66790fc2c0a2 - Added method parseIdentifierListType(). aziz parents: 152 diff changeset	1508 {
484 265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	1509 identList ~= set(new IdentifierType(token), begin);
153 66790fc2c0a2 - Added method parseIdentifierListType(). aziz parents: 152 diff changeset	1510 nT();
66790fc2c0a2 - Added method parseIdentifierListType(). aziz parents: 152 diff changeset	1511 }
66790fc2c0a2 - Added method parseIdentifierListType(). aziz parents: 152 diff changeset	1512 else if (token.type == T.Typeof)
66790fc2c0a2 - Added method parseIdentifierListType(). aziz parents: 152 diff changeset	1513 {
66790fc2c0a2 - Added method parseIdentifierListType(). aziz parents: 152 diff changeset	1514 requireNext(T.LParen);
484 265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	1515 identList ~= set(new TypeofType(parseExpression()), begin);
153 66790fc2c0a2 - Added method parseIdentifierListType(). aziz parents: 152 diff changeset	1516 require(T.RParen);
66790fc2c0a2 - Added method parseIdentifierListType(). aziz parents: 152 diff changeset	1517 if (token.type != T.Dot)
154 0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1518 goto Lreturn;
153 66790fc2c0a2 - Added method parseIdentifierListType(). aziz parents: 152 diff changeset	1519 nT();
66790fc2c0a2 - Added method parseIdentifierListType(). aziz parents: 152 diff changeset	1520 }
66790fc2c0a2 - Added method parseIdentifierListType(). aziz parents: 152 diff changeset	1521
66790fc2c0a2 - Added method parseIdentifierListType(). aziz parents: 152 diff changeset	1522 while (1)
66790fc2c0a2 - Added method parseIdentifierListType(). aziz parents: 152 diff changeset	1523 {
484 265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	1524 begin = token;
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	1525 auto ident = requireId();
154 0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1526 // 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	1527 if (token.type == T.Not/+ && peekNext() == T.LParen+/) // Identifier !( TemplateArguments )
153 66790fc2c0a2 - Added method parseIdentifierListType(). aziz parents: 152 diff changeset	1528 {
66790fc2c0a2 - Added method parseIdentifierListType(). aziz parents: 152 diff changeset	1529 nT(); // Skip !.
484 265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	1530 identList ~= set(new TemplateInstanceType(ident, parseTemplateArguments()), begin);
153 66790fc2c0a2 - Added method parseIdentifierListType(). aziz parents: 152 diff changeset	1531 }
66790fc2c0a2 - Added method parseIdentifierListType(). aziz parents: 152 diff changeset	1532 else // Identifier
484 265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	1533 identList ~= set(new IdentifierType(ident), begin);
153 66790fc2c0a2 - Added method parseIdentifierListType(). aziz parents: 152 diff changeset	1534
66790fc2c0a2 - Added method parseIdentifierListType(). aziz parents: 152 diff changeset	1535 if (token.type != T.Dot)
66790fc2c0a2 - Added method parseIdentifierListType(). aziz parents: 152 diff changeset	1536 break;
66790fc2c0a2 - Added method parseIdentifierListType(). aziz parents: 152 diff changeset	1537 nT();
66790fc2c0a2 - Added method parseIdentifierListType(). aziz parents: 152 diff changeset	1538 }
154 0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1539 Lreturn:
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1540 return new DotListType(identList);
153 66790fc2c0a2 - Added method parseIdentifierListType(). aziz parents: 152 diff changeset	1541 }
66790fc2c0a2 - Added method parseIdentifierListType(). aziz parents: 152 diff changeset	1542
150 753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1543 /*
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1544 TemplateMixin:
151 2e959f67000b - Added code for parsing mixin expression declarations. aziz parents: 150 diff changeset	1545 mixin ( AssignExpression ) ;
150 753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1546 mixin TemplateIdentifier ;
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1547 mixin TemplateIdentifier MixinIdentifier ;
233 c2b601dcd57d - Added assert to parseDotListExpression(). aziz parents: 232 diff changeset	1548 mixin TemplateIdentifier !( TemplateArguments ) ;
c2b601dcd57d - Added assert to parseDotListExpression(). aziz parents: 232 diff changeset	1549 mixin TemplateIdentifier !( TemplateArguments ) MixinIdentifier ;
150 753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1550 */
256 8f27920ae17a - Made parseMixinDeclaration() a template. aziz parents: 255 diff changeset	1551 Class parseMixin(Class)()
150 753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1552 {
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1553 assert(token.type == T.Mixin);
256 8f27920ae17a - Made parseMixinDeclaration() a template. aziz parents: 255 diff changeset	1554 auto begin = token;
150 753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1555 nT(); // Skip mixin keyword.
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1556
256 8f27920ae17a - Made parseMixinDeclaration() a template. aziz parents: 255 diff changeset	1557 static if (is(Class == MixinDeclaration))
301 caef255a2801 - Fix in some ctors: adding only non-null members to this.children. aziz parents: 299 diff changeset	1558 {
151 2e959f67000b - Added code for parsing mixin expression declarations. aziz parents: 150 diff changeset	1559 if (token.type == T.LParen)
2e959f67000b - Added code for parsing mixin expression declarations. aziz parents: 150 diff changeset	1560 {
2e959f67000b - Added code for parsing mixin expression declarations. aziz parents: 150 diff changeset	1561 // TODO: What about mixin(...).ident;?
2e959f67000b - Added code for parsing mixin expression declarations. aziz parents: 150 diff changeset	1562 nT();
2e959f67000b - Added code for parsing mixin expression declarations. aziz parents: 150 diff changeset	1563 auto e = parseAssignExpression();
2e959f67000b - Added code for parsing mixin expression declarations. aziz parents: 150 diff changeset	1564 require(T.RParen);
2e959f67000b - Added code for parsing mixin expression declarations. aziz parents: 150 diff changeset	1565 require(T.Semicolon);
262 0f22269e76ff - Changed some string types to Token. aziz* parents: 261 diff changeset	1566 return new MixinDeclaration(e);
151 2e959f67000b - Added code for parsing mixin expression declarations. aziz parents: 150 diff changeset	1567 }
301 caef255a2801 - Fix in some ctors: adding only non-null members to this.children. aziz parents: 299 diff changeset	1568 }
151 2e959f67000b - Added code for parsing mixin expression declarations. aziz parents: 150 diff changeset	1569
150 753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1570 Expression[] templateIdent;
252 788398655d24 - Changed some string types to Token. Adapted parser accordingly. aziz* parents: 251 diff changeset	1571 Token* mixinIdent;
150 753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1572
159 5aa877506db0 - Added enum Linkage. aziz parents: 158 diff changeset	1573 // This code is similar to parseDotListType().
150 753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1574 if (token.type == T.Dot)
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1575 {
484 265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	1576 templateIdent ~= set(new IdentifierExpression(token), begin);
150 753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1577 nT();
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1578 }
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1579
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1580 while (1)
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1581 {
484 265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	1582 begin = token;
252 788398655d24 - Changed some string types to Token. Adapted parser accordingly. aziz* parents: 251 diff changeset	1583 auto ident = requireId();
788398655d24 - Changed some string types to Token. Adapted parser accordingly. aziz* parents: 251 diff changeset	1584 Expression e;
150 753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1585 if (token.type == T.Not) // Identifier !( TemplateArguments )
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1586 {
151 2e959f67000b - Added code for parsing mixin expression declarations. aziz parents: 150 diff changeset	1587 // 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	1588 nT();
484 265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	1589 e = set(new TemplateInstanceExpression(ident, parseTemplateArguments()), begin);
150 753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1590 }
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1591 else // Identifier
484 265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	1592 e = set(new IdentifierExpression(ident), begin);
252 788398655d24 - Changed some string types to Token. Adapted parser accordingly. aziz* parents: 251 diff changeset	1593
788398655d24 - Changed some string types to Token. Adapted parser accordingly. aziz* parents: 251 diff changeset	1594 templateIdent ~= e;
150 753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1595
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1596 if (token.type != T.Dot)
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1597 break;
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1598 nT();
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1599 }
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1600
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1601 if (token.type == T.Identifier)
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1602 {
252 788398655d24 - Changed some string types to Token. Adapted parser accordingly. aziz* parents: 251 diff changeset	1603 mixinIdent = token;
150 753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1604 nT();
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1605 }
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1606
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1607 require(T.Semicolon);
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1608
262 0f22269e76ff - Changed some string types to Token. aziz* parents: 261 diff changeset	1609 return new Class(templateIdent, mixinIdent);
150 753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1610 }
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1611
102 6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	1612 /+++++++++++++++++++++++++++++
161 82c5cfc7d6d3 - Started implementation of parsing statements. aziz parents: 160 diff changeset	1613 + Statement parsing methods +
82c5cfc7d6d3 - Started implementation of parsing statements. aziz parents: 160 diff changeset	1614 +++++++++++++++++++++++++++++/
82c5cfc7d6d3 - Started implementation of parsing statements. aziz parents: 160 diff changeset	1615
82c5cfc7d6d3 - Started implementation of parsing statements. aziz parents: 160 diff changeset	1616 Statements parseStatements()
82c5cfc7d6d3 - Started implementation of parsing statements. aziz parents: 160 diff changeset	1617 {
262 0f22269e76ff - Changed some string types to Token. aziz* parents: 261 diff changeset	1618 auto begin = token;
318 a1c9d93a66e3 - Added member prevToken to Parser. aziz parents: 314 diff changeset	1619 require(T.LBrace);
162 c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	1620 auto statements = new Statements();
161 82c5cfc7d6d3 - Started implementation of parsing statements. aziz parents: 160 diff changeset	1621 while (token.type != T.RBrace && token.type != T.EOF)
82c5cfc7d6d3 - Started implementation of parsing statements. aziz parents: 160 diff changeset	1622 statements ~= parseStatement();
318 a1c9d93a66e3 - Added member prevToken to Parser. aziz parents: 314 diff changeset	1623 require(T.RBrace);
262 0f22269e76ff - Changed some string types to Token. aziz* parents: 261 diff changeset	1624 return set(statements, begin);
161 82c5cfc7d6d3 - Started implementation of parsing statements. aziz parents: 160 diff changeset	1625 }
82c5cfc7d6d3 - Started implementation of parsing statements. aziz parents: 160 diff changeset	1626
82c5cfc7d6d3 - Started implementation of parsing statements. aziz parents: 160 diff changeset	1627 Statement parseStatement()
82c5cfc7d6d3 - Started implementation of parsing statements. aziz parents: 160 diff changeset	1628 {
261 966756c5d5d3 - Added begin variables and calls to set(). aziz parents: 260 diff changeset	1629 auto begin = token;
161 82c5cfc7d6d3 - Started implementation of parsing statements. aziz parents: 160 diff changeset	1630 Statement s;
188 5c6ebf9f60a9 - Added code for parsing DeclarationStatement. aziz parents: 187 diff changeset	1631 Declaration d;
161 82c5cfc7d6d3 - Started implementation of parsing statements. aziz parents: 160 diff changeset	1632 switch (token.type)
82c5cfc7d6d3 - Started implementation of parsing statements. aziz parents: 160 diff changeset	1633 {
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1634 case T.Align:
260 b83180748ae6 - Added method parseAlignAttribute(). aziz parents: 259 diff changeset	1635 int size = -1;
b83180748ae6 - Added method parseAlignAttribute(). aziz parents: 259 diff changeset	1636 auto intTok = parseAlignAttribute();
b83180748ae6 - Added method parseAlignAttribute(). aziz parents: 259 diff changeset	1637 if (intTok)
b83180748ae6 - Added method parseAlignAttribute(). aziz parents: 259 diff changeset	1638 size = intTok.int_;
b83180748ae6 - Added method parseAlignAttribute(). aziz parents: 259 diff changeset	1639 // Restrict align attribute to structs in parsing phase.
b83180748ae6 - Added method parseAlignAttribute(). aziz parents: 259 diff changeset	1640 Declaration structDecl;
b83180748ae6 - Added method parseAlignAttribute(). aziz parents: 259 diff changeset	1641 if (token.type == T.Struct)
b83180748ae6 - Added method parseAlignAttribute(). aziz parents: 259 diff changeset	1642 structDecl = parseAggregateDeclaration();
b83180748ae6 - Added method parseAlignAttribute(). aziz parents: 259 diff changeset	1643 else
b83180748ae6 - Added method parseAlignAttribute(). aziz parents: 259 diff changeset	1644 expected(T.Struct);
305 df237b3b5f09 - Added class Declarations. aziz parents: 304 diff changeset	1645 d = new AlignDeclaration(size, structDecl ? structDecl : new Declarations);
483 180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	1646 goto LreturnDeclarationStatement;
201 70715b9e2109 - Implemented parseAttributeStatement(). aziz parents: 200 diff changeset	1647 /+ Not applicable for statements.
191 3ce110cefbc5 - Added code for parsing AliasDeclaration and TypedefDeclaration. aziz parents: 190 diff changeset	1648 // T.Private,
3ce110cefbc5 - Added code for parsing AliasDeclaration and TypedefDeclaration. aziz parents: 190 diff changeset	1649 // T.Package,
3ce110cefbc5 - Added code for parsing AliasDeclaration and TypedefDeclaration. aziz parents: 190 diff changeset	1650 // T.Protected,
3ce110cefbc5 - Added code for parsing AliasDeclaration and TypedefDeclaration. aziz parents: 190 diff changeset	1651 // T.Public,
3ce110cefbc5 - Added code for parsing AliasDeclaration and TypedefDeclaration. aziz parents: 190 diff changeset	1652 // T.Export,
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1653 // T.Deprecated,
191 3ce110cefbc5 - Added code for parsing AliasDeclaration and TypedefDeclaration. aziz parents: 190 diff changeset	1654 // T.Override,
3ce110cefbc5 - Added code for parsing AliasDeclaration and TypedefDeclaration. aziz parents: 190 diff changeset	1655 // T.Abstract,
201 70715b9e2109 - Implemented parseAttributeStatement(). aziz parents: 200 diff changeset	1656 +/
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1657 case T.Extern,
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1658 T.Final,
191 3ce110cefbc5 - Added code for parsing AliasDeclaration and TypedefDeclaration. aziz parents: 190 diff changeset	1659 T.Const,
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1660 T.Auto:
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1661 //T.Scope
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1662 //T.Static
201 70715b9e2109 - Implemented parseAttributeStatement(). aziz parents: 200 diff changeset	1663 case_parseAttribute:
70715b9e2109 - Implemented parseAttributeStatement(). aziz parents: 200 diff changeset	1664 s = parseAttributeStatement();
261 966756c5d5d3 - Added begin variables and calls to set(). aziz parents: 260 diff changeset	1665 return s;
161 82c5cfc7d6d3 - Started implementation of parsing statements. aziz parents: 160 diff changeset	1666 case T.Identifier:
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1667 if (peekNext() == T.Colon)
161 82c5cfc7d6d3 - Started implementation of parsing statements. aziz parents: 160 diff changeset	1668 {
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	1669 auto ident = token;
161 82c5cfc7d6d3 - Started implementation of parsing statements. aziz parents: 160 diff changeset	1670 nT(); // Skip Identifier
82c5cfc7d6d3 - Started implementation of parsing statements. aziz parents: 160 diff changeset	1671 nT(); // Skip :
234 5c1111dc8670 - Added method parseNoScopeOrEmptyStatement(). aziz parents: 233 diff changeset	1672 s = new LabeledStatement(ident, parseNoScopeOrEmptyStatement());
161 82c5cfc7d6d3 - Started implementation of parsing statements. aziz parents: 160 diff changeset	1673 break;
82c5cfc7d6d3 - Started implementation of parsing statements. aziz parents: 160 diff changeset	1674 }
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	1675 goto case T.Dot;
201 70715b9e2109 - Implemented parseAttributeStatement(). aziz parents: 200 diff changeset	1676 case T.Dot, T.Typeof:
214 45fc474c1678 - Changed 'failed' parameter of try_() to 'success'. aziz parents: 213 diff changeset	1677 bool success;
483 180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	1678 d = try_({return parseDeclaration(StorageClass.None, false);}, success);
214 45fc474c1678 - Changed 'failed' parameter of try_() to 'success'. aziz parents: 213 diff changeset	1679 if (success)
483 180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	1680 goto LreturnDeclarationStatement; // Declaration
201 70715b9e2109 - Implemented parseAttributeStatement(). aziz parents: 200 diff changeset	1681 else
483 180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	1682 goto case_parseExpressionStatement; // Expression
180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	1683 // IntegralType
201 70715b9e2109 - Implemented parseAttributeStatement(). aziz parents: 200 diff changeset	1684 case T.Char, T.Wchar, T.Dchar, T.Bool,
70715b9e2109 - Implemented parseAttributeStatement(). aziz parents: 200 diff changeset	1685 T.Byte, T.Ubyte, T.Short, T.Ushort,
70715b9e2109 - Implemented parseAttributeStatement(). aziz parents: 200 diff changeset	1686 T.Int, T.Uint, T.Long, T.Ulong,
70715b9e2109 - Implemented parseAttributeStatement(). aziz parents: 200 diff changeset	1687 T.Float, T.Double, T.Real,
70715b9e2109 - Implemented parseAttributeStatement(). aziz parents: 200 diff changeset	1688 T.Ifloat, T.Idouble, T.Ireal,
70715b9e2109 - Implemented parseAttributeStatement(). aziz parents: 200 diff changeset	1689 T.Cfloat, T.Cdouble, T.Creal, T.Void:
70715b9e2109 - Implemented parseAttributeStatement(). aziz parents: 200 diff changeset	1690 case_parseDeclaration:
70715b9e2109 - Implemented parseAttributeStatement(). aziz parents: 200 diff changeset	1691 d = parseDeclaration();
483 180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	1692 goto LreturnDeclarationStatement;
162 c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	1693 case T.If:
c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	1694 s = parseIfStatement();
c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	1695 break;
164 8ec99326752b - Implemented parseWhileStatement(). aziz parents: 163 diff changeset	1696 case T.While:
8ec99326752b - Implemented parseWhileStatement(). aziz parents: 163 diff changeset	1697 s = parseWhileStatement();
8ec99326752b - Implemented parseWhileStatement(). aziz parents: 163 diff changeset	1698 break;
165 797074d143d7 - Implemented parseDoWhileStatement(). aziz parents: 164 diff changeset	1699 case T.Do:
797074d143d7 - Implemented parseDoWhileStatement(). aziz parents: 164 diff changeset	1700 s = parseDoWhileStatement();
797074d143d7 - Implemented parseDoWhileStatement(). aziz parents: 164 diff changeset	1701 break;
216 984d48932bce - Added class EmptyStatement. aziz parents: 214 diff changeset	1702 case T.For:
984d48932bce - Added class EmptyStatement. aziz parents: 214 diff changeset	1703 s = parseForStatement();
984d48932bce - Added class EmptyStatement. aziz parents: 214 diff changeset	1704 break;
169 4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	1705 case T.Foreach, T.Foreach_reverse:
4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	1706 s = parseForeachStatement();
4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	1707 break;
170 a63696d1c474 - Implemented parseSwitchStatement(). aziz parents: 169 diff changeset	1708 case T.Switch:
a63696d1c474 - Implemented parseSwitchStatement(). aziz parents: 169 diff changeset	1709 s = parseSwitchStatement();
a63696d1c474 - Implemented parseSwitchStatement(). aziz parents: 169 diff changeset	1710 break;
171 f1fa9bbdb4cb - Implemented parseCaseStatement(). aziz parents: 170 diff changeset	1711 case T.Case:
f1fa9bbdb4cb - Implemented parseCaseStatement(). aziz parents: 170 diff changeset	1712 s = parseCaseStatement();
f1fa9bbdb4cb - Implemented parseCaseStatement(). aziz parents: 170 diff changeset	1713 break;
172 89d4519bd8a1 - Implemented parseDefaultStatement(). aziz parents: 171 diff changeset	1714 case T.Default:
89d4519bd8a1 - Implemented parseDefaultStatement(). aziz parents: 171 diff changeset	1715 s = parseDefaultStatement();
89d4519bd8a1 - Implemented parseDefaultStatement(). aziz parents: 171 diff changeset	1716 break;
173 c2714ba44350 - Implemented parseContinueStatement(). aziz parents: 172 diff changeset	1717 case T.Continue:
c2714ba44350 - Implemented parseContinueStatement(). aziz parents: 172 diff changeset	1718 s = parseContinueStatement();
c2714ba44350 - Implemented parseContinueStatement(). aziz parents: 172 diff changeset	1719 break;
174 e51c9ee66ea0 - Implemented parseBreakStatement(). aziz parents: 173 diff changeset	1720 case T.Break:
e51c9ee66ea0 - Implemented parseBreakStatement(). aziz parents: 173 diff changeset	1721 s = parseBreakStatement();
e51c9ee66ea0 - Implemented parseBreakStatement(). aziz parents: 173 diff changeset	1722 break;
175 522df6f0f230 - Implemented parseReturnStatement(). aziz parents: 174 diff changeset	1723 case T.Return:
522df6f0f230 - Implemented parseReturnStatement(). aziz parents: 174 diff changeset	1724 s = parseReturnStatement();
522df6f0f230 - Implemented parseReturnStatement(). aziz parents: 174 diff changeset	1725 break;
176 3071522c0cf0 - Implemented parseGotoStatement(). aziz parents: 175 diff changeset	1726 case T.Goto:
3071522c0cf0 - Implemented parseGotoStatement(). aziz parents: 175 diff changeset	1727 s = parseGotoStatement();
3071522c0cf0 - Implemented parseGotoStatement(). aziz parents: 175 diff changeset	1728 break;
177 504b1b2f7c93 - Implemented parseWithStatement(). aziz parents: 176 diff changeset	1729 case T.With:
504b1b2f7c93 - Implemented parseWithStatement(). aziz parents: 176 diff changeset	1730 s = parseWithStatement();
504b1b2f7c93 - Implemented parseWithStatement(). aziz parents: 176 diff changeset	1731 break;
178 62718b29679e - Implemented parseSynchronizedStatement(). aziz parents: 177 diff changeset	1732 case T.Synchronized:
62718b29679e - Implemented parseSynchronizedStatement(). aziz parents: 177 diff changeset	1733 s = parseSynchronizedStatement();
62718b29679e - Implemented parseSynchronizedStatement(). aziz parents: 177 diff changeset	1734 break;
179 507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	1735 case T.Try:
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	1736 s = parseTryStatement();
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	1737 break;
180 d5a67aa578a8 - Implemented parseThrowStatement(). aziz parents: 179 diff changeset	1738 case T.Throw:
d5a67aa578a8 - Implemented parseThrowStatement(). aziz parents: 179 diff changeset	1739 s = parseThrowStatement();
d5a67aa578a8 - Implemented parseThrowStatement(). aziz parents: 179 diff changeset	1740 break;
181 abfd51142477 - Implemented parseScopeGuardStatement(). aziz parents: 180 diff changeset	1741 case T.Scope:
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1742 if (peekNext() != T.LParen)
201 70715b9e2109 - Implemented parseAttributeStatement(). aziz parents: 200 diff changeset	1743 goto case_parseAttribute;
181 abfd51142477 - Implemented parseScopeGuardStatement(). aziz parents: 180 diff changeset	1744 s = parseScopeGuardStatement();
abfd51142477 - Implemented parseScopeGuardStatement(). aziz parents: 180 diff changeset	1745 break;
182 673b355ba0e9 - Implemented parseVolatileStatement(). aziz parents: 181 diff changeset	1746 case T.Volatile:
673b355ba0e9 - Implemented parseVolatileStatement(). aziz parents: 181 diff changeset	1747 s = parseVolatileStatement();
673b355ba0e9 - Implemented parseVolatileStatement(). aziz parents: 181 diff changeset	1748 break;
183 c9df82f6f6be - Added parseAsmStatement() stub. aziz parents: 182 diff changeset	1749 case T.Asm:
c9df82f6f6be - Added parseAsmStatement() stub. aziz parents: 182 diff changeset	1750 s = parseAsmStatement();
c9df82f6f6be - Added parseAsmStatement() stub. aziz parents: 182 diff changeset	1751 break;
184 30a4c8522b09 - Implemented parsePragmaStatement(). aziz parents: 183 diff changeset	1752 case T.Pragma:
30a4c8522b09 - Implemented parsePragmaStatement(). aziz parents: 183 diff changeset	1753 s = parsePragmaStatement();
30a4c8522b09 - Implemented parsePragmaStatement(). aziz parents: 183 diff changeset	1754 break;
185 35c93b776be0 - Added code for parsing MixinStatements. aziz parents: 184 diff changeset	1755 case T.Mixin:
246 52f4aa097865 - Fix: parse mixin as expression instead of statement when next token is T.LParen. aziz parents: 245 diff changeset	1756 if (peekNext() == T.LParen)
483 180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	1757 goto case_parseExpressionStatement; // Parse as expression.
256 8f27920ae17a - Made parseMixinDeclaration() a template. aziz parents: 255 diff changeset	1758 s = parseMixin!(MixinStatement)();
185 35c93b776be0 - Added code for parsing MixinStatements. aziz parents: 184 diff changeset	1759 break;
186 d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	1760 case T.Static:
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1761 switch (peekNext())
186 d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	1762 {
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	1763 case T.If:
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	1764 s = parseStaticIfStatement();
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	1765 break;
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	1766 case T.Assert:
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	1767 s = parseStaticAssertStatement();
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	1768 break;
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	1769 default:
201 70715b9e2109 - Implemented parseAttributeStatement(). aziz parents: 200 diff changeset	1770 goto case_parseAttribute;
186 d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	1771 }
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1772 break;
190 d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	1773 case T.Debug:
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	1774 s = parseDebugStatement();
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	1775 break;
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	1776 case T.Version:
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	1777 s = parseVersionStatement();
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	1778 break;
226 aa38e1401217 - Fixed cases T.Alias and T.Typedef. Wrong function called. aziz parents: 225 diff changeset	1779 // DeclDef
aa38e1401217 - Fixed cases T.Alias and T.Typedef. Wrong function called. aziz parents: 225 diff changeset	1780 case T.Alias, T.Typedef:
aa38e1401217 - Fixed cases T.Alias and T.Typedef. Wrong function called. aziz parents: 225 diff changeset	1781 d = parseDeclarationDefinition();
483 180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	1782 goto LreturnDeclarationStatement;
188 5c6ebf9f60a9 - Added code for parsing DeclarationStatement. aziz parents: 187 diff changeset	1783 case T.Enum:
5c6ebf9f60a9 - Added code for parsing DeclarationStatement. aziz parents: 187 diff changeset	1784 d = parseEnumDeclaration();
483 180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	1785 goto LreturnDeclarationStatement;
188 5c6ebf9f60a9 - Added code for parsing DeclarationStatement. aziz parents: 187 diff changeset	1786 case T.Class:
5c6ebf9f60a9 - Added code for parsing DeclarationStatement. aziz parents: 187 diff changeset	1787 d = parseClassDeclaration();
483 180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	1788 goto LreturnDeclarationStatement;
188 5c6ebf9f60a9 - Added code for parsing DeclarationStatement. aziz parents: 187 diff changeset	1789 case T.Interface:
5c6ebf9f60a9 - Added code for parsing DeclarationStatement. aziz parents: 187 diff changeset	1790 d = parseInterfaceDeclaration();
483 180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	1791 goto LreturnDeclarationStatement;
188 5c6ebf9f60a9 - Added code for parsing DeclarationStatement. aziz parents: 187 diff changeset	1792 case T.Struct, T.Union:
5c6ebf9f60a9 - Added code for parsing DeclarationStatement. aziz parents: 187 diff changeset	1793 d = parseAggregateDeclaration();
483 180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	1794 // goto LreturnDeclarationStatement;
180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	1795 LreturnDeclarationStatement:
261 966756c5d5d3 - Added begin variables and calls to set(). aziz parents: 260 diff changeset	1796 set(d, begin);
188 5c6ebf9f60a9 - Added code for parsing DeclarationStatement. aziz parents: 187 diff changeset	1797 s = new DeclarationStatement(d);
5c6ebf9f60a9 - Added code for parsing DeclarationStatement. aziz parents: 187 diff changeset	1798 break;
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	1799 case T.LBrace:
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	1800 s = parseScopeStatement();
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	1801 break;
216 984d48932bce - Added class EmptyStatement. aziz parents: 214 diff changeset	1802 case T.Semicolon:
231 6846138a0e24 - Fixed parseEnumDeclaration(). aziz parents: 230 diff changeset	1803 nT();
216 984d48932bce - Added class EmptyStatement. aziz parents: 214 diff changeset	1804 s = new EmptyStatement();
984d48932bce - Added class EmptyStatement. aziz parents: 214 diff changeset	1805 break;
400 a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1806 /+
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1807 Parse ExpressionStatement:
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1808 +/
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1809 // 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	1810 // 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	1811 case T.This:
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1812 case T.Super:
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1813 case T.Null:
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1814 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	1815 // case T.Dollar:
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1816 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	1817 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	1818 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	1819 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	1820 case T.String:
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1821 case T.LBracket:
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1822 // case T.LBrace:
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1823 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	1824 case T.Assert:
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1825 // case T.Mixin:
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1826 case T.Import:
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1827 case T.Typeid:
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1828 case T.Is:
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1829 case T.LParen:
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1830 // IntegralType
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1831 /+case T.Char, T.Wchar, T.Dchar, T.Bool,
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1832 T.Byte, T.Ubyte, T.Short, T.Ushort,
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1833 T.Int, T.Uint, T.Long, T.Ulong,
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1834 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	1835 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	1836 T.Cfloat, T.Cdouble, T.Creal, T.Void:+/
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1837 case T.Traits:
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1838 // 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	1839 case T.AndBinary,
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1840 T.PlusPlus,
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1841 T.MinusMinus,
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1842 T.Mul,
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1843 T.Minus,
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1844 T.Plus,
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1845 T.Not,
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1846 T.Tilde,
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1847 T.New,
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1848 T.Delete,
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1849 T.Cast:
483 180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	1850 case_parseExpressionStatement:
400 a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1851 s = new ExpressionStatement(parseExpression());
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1852 require(T.Semicolon);
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1853 break;
161 82c5cfc7d6d3 - Started implementation of parsing statements. aziz parents: 160 diff changeset	1854 default:
400 a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1855 if (token.isSpecialToken)
483 180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	1856 goto case_parseExpressionStatement;
400 a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1857
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1858 // Assert that this isn't a valid expression.
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1859 assert(
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1860 delegate bool(){
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1861 bool success;
423 6057113f9a44 Refactored Parser.try_(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 422 diff changeset	1862 auto expression = try_(&parseExpression, success);
400 a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1863 return success;
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1864 }() == false, "Any token that could start a valid expression must have been caught by a case statement in parseStatement()."
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1865 );
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1866
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1867 // Report error: it's an illegal statement.
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1868 error(MID.ExpectedButFound, "Statement", token.srcText);
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1869 s = new IllegalStatement(token);
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1870 nT();
161 82c5cfc7d6d3 - Started implementation of parsing statements. aziz parents: 160 diff changeset	1871 }
205 e5a4f88982d1 - Added assert at the end of parseStatement(). aziz parents: 204 diff changeset	1872 assert(s !is null);
261 966756c5d5d3 - Added begin variables and calls to set(). aziz parents: 260 diff changeset	1873 set(s, begin);
161 82c5cfc7d6d3 - Started implementation of parsing statements. aziz parents: 160 diff changeset	1874 return s;
82c5cfc7d6d3 - Started implementation of parsing statements. aziz parents: 160 diff changeset	1875 }
82c5cfc7d6d3 - Started implementation of parsing statements. aziz parents: 160 diff changeset	1876
162 c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	1877 /+
c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	1878 ScopeStatement:
219 0d14a09227a4 - Simplified parseScopeStatement(). aziz parents: 218 diff changeset	1879 NoScopeStatement
162 c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	1880 +/
164 8ec99326752b - Implemented parseWhileStatement(). aziz parents: 163 diff changeset	1881 Statement parseScopeStatement()
162 c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	1882 {
219 0d14a09227a4 - Simplified parseScopeStatement(). aziz parents: 218 diff changeset	1883 return new ScopeStatement(parseNoScopeStatement());
162 c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	1884 }
c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	1885
166 56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1886 /+
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1887 NoScopeStatement:
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1888 NonEmptyStatement
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1889 BlockStatement
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1890 BlockStatement:
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1891 { }
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1892 { StatementList }
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1893 +/
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1894 Statement parseNoScopeStatement()
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1895 {
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1896 Statement s;
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1897 if (token.type == T.LBrace)
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1898 {
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1899 nT();
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1900 auto ss = new Statements();
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1901 while (token.type != T.RBrace && token.type != T.EOF)
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1902 ss ~= parseStatement();
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1903 require(T.RBrace);
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1904 s = ss;
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1905 }
219 0d14a09227a4 - Simplified parseScopeStatement(). aziz parents: 218 diff changeset	1906 else if (token.type == T.Semicolon)
0d14a09227a4 - Simplified parseScopeStatement(). aziz parents: 218 diff changeset	1907 {
0d14a09227a4 - Simplified parseScopeStatement(). aziz parents: 218 diff changeset	1908 error(MID.ExpectedButFound, "non-empty statement", ";");
0d14a09227a4 - Simplified parseScopeStatement(). aziz parents: 218 diff changeset	1909 s = new EmptyStatement();
0d14a09227a4 - Simplified parseScopeStatement(). aziz parents: 218 diff changeset	1910 nT();
0d14a09227a4 - Simplified parseScopeStatement(). aziz parents: 218 diff changeset	1911 }
166 56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1912 else
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1913 s = parseStatement();
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1914 return s;
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1915 }
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1916
234 5c1111dc8670 - Added method parseNoScopeOrEmptyStatement(). aziz parents: 233 diff changeset	1917 /+
5c1111dc8670 - Added method parseNoScopeOrEmptyStatement(). aziz parents: 233 diff changeset	1918 NoScopeOrEmptyStatement:
5c1111dc8670 - Added method parseNoScopeOrEmptyStatement(). aziz parents: 233 diff changeset	1919 ;
5c1111dc8670 - Added method parseNoScopeOrEmptyStatement(). aziz parents: 233 diff changeset	1920 NoScopeStatement
5c1111dc8670 - Added method parseNoScopeOrEmptyStatement(). aziz parents: 233 diff changeset	1921 +/
5c1111dc8670 - Added method parseNoScopeOrEmptyStatement(). aziz parents: 233 diff changeset	1922 Statement parseNoScopeOrEmptyStatement()
5c1111dc8670 - Added method parseNoScopeOrEmptyStatement(). aziz parents: 233 diff changeset	1923 {
5c1111dc8670 - Added method parseNoScopeOrEmptyStatement(). aziz parents: 233 diff changeset	1924 if (token.type == T.Semicolon)
312 fa0b6f32c1ae - Added Special to enum TOK. aziz parents: 305 diff changeset	1925 {
234 5c1111dc8670 - Added method parseNoScopeOrEmptyStatement(). aziz parents: 233 diff changeset	1926 nT();
312 fa0b6f32c1ae - Added Special to enum TOK. aziz parents: 305 diff changeset	1927 return new EmptyStatement();
fa0b6f32c1ae - Added Special to enum TOK. aziz parents: 305 diff changeset	1928 }
234 5c1111dc8670 - Added method parseNoScopeOrEmptyStatement(). aziz parents: 233 diff changeset	1929 else
5c1111dc8670 - Added method parseNoScopeOrEmptyStatement(). aziz parents: 233 diff changeset	1930 return parseNoScopeStatement();
5c1111dc8670 - Added method parseNoScopeOrEmptyStatement(). aziz parents: 233 diff changeset	1931 }
5c1111dc8670 - Added method parseNoScopeOrEmptyStatement(). aziz parents: 233 diff changeset	1932
201 70715b9e2109 - Implemented parseAttributeStatement(). aziz parents: 200 diff changeset	1933 Statement parseAttributeStatement()
70715b9e2109 - Implemented parseAttributeStatement(). aziz parents: 200 diff changeset	1934 {
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1935 StorageClass stc, tmp;
359 511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	1936 Linkage.Category link_cat;
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1937
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1938 void addStorageClass()
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1939 {
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1940 if (stc & tmp)
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1941 {
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1942 error(MID.RedundantStorageClass, token.srcText);
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1943 }
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1944 else
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1945 stc \|= tmp;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1946 }
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1947
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1948 Statement parse()
201 70715b9e2109 - Implemented parseAttributeStatement(). aziz parents: 200 diff changeset	1949 {
261 966756c5d5d3 - Added begin variables and calls to set(). aziz parents: 260 diff changeset	1950 auto begin = token;
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1951 Statement s;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1952 switch (token.type)
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1953 {
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1954 case T.Extern:
359 511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	1955 stc \|= StorageClass.Extern;
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1956 nT();
359 511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	1957 Linkage linkage = parseLinkage();
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	1958
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	1959 // Check for redundancy.
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	1960 Linkage.Category link_cat_tmp = Linkage.getCategory(linkage);
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	1961 if (link_cat & link_cat_tmp)
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1962 {
359 511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	1963 char[] srcText = begin.srcText;
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	1964 if (link_cat_tmp == Linkage.Category.MangleSymbol)
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	1965 srcText = begin.start[0 .. prevToken.end - begin.start];
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	1966 error(MID.RedundantStorageClass, srcText);
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1967 }
359 511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	1968 else
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	1969 link_cat \|= link_cat_tmp;
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	1970
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1971 s = new ExternStatement(linkage, parse());
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1972 break;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1973 case T.Static:
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1974 tmp = StorageClass.Static;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1975 goto Lcommon;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1976 case T.Final:
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1977 tmp = StorageClass.Final;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1978 goto Lcommon;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1979 case T.Const:
270 764eccdf619d - Fix in parseAttributeStatement(): added checks for T.LParen after const/invariant. aziz parents: 269 diff changeset	1980 version(D2)
764eccdf619d - Fix in parseAttributeStatement(): added checks for T.LParen after const/invariant. aziz parents: 269 diff changeset	1981 {
764eccdf619d - Fix in parseAttributeStatement(): added checks for T.LParen after const/invariant. aziz parents: 269 diff changeset	1982 if (peekNext() == T.LParen)
764eccdf619d - Fix in parseAttributeStatement(): added checks for T.LParen after const/invariant. aziz parents: 269 diff changeset	1983 goto case_Declaration;
764eccdf619d - Fix in parseAttributeStatement(): added checks for T.LParen after const/invariant. aziz parents: 269 diff changeset	1984 }
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1985 tmp = StorageClass.Const;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1986 goto Lcommon;
270 764eccdf619d - Fix in parseAttributeStatement(): added checks for T.LParen after const/invariant. aziz parents: 269 diff changeset	1987 version(D2)
764eccdf619d - Fix in parseAttributeStatement(): added checks for T.LParen after const/invariant. aziz parents: 269 diff changeset	1988 {
764eccdf619d - Fix in parseAttributeStatement(): added checks for T.LParen after const/invariant. aziz parents: 269 diff changeset	1989 case T.Invariant: // D 2.0
764eccdf619d - Fix in parseAttributeStatement(): added checks for T.LParen after const/invariant. aziz parents: 269 diff changeset	1990 if (peekNext() == T.LParen)
764eccdf619d - Fix in parseAttributeStatement(): added checks for T.LParen after const/invariant. aziz parents: 269 diff changeset	1991 goto case_Declaration;
764eccdf619d - Fix in parseAttributeStatement(): added checks for T.LParen after const/invariant. aziz parents: 269 diff changeset	1992 tmp = StorageClass.Invariant;
764eccdf619d - Fix in parseAttributeStatement(): added checks for T.LParen after const/invariant. aziz parents: 269 diff changeset	1993 goto Lcommon;
764eccdf619d - Fix in parseAttributeStatement(): added checks for T.LParen after const/invariant. aziz parents: 269 diff changeset	1994 }
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1995 case T.Auto:
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1996 tmp = StorageClass.Auto;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1997 goto Lcommon;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1998 case T.Scope:
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1999 tmp = StorageClass.Scope;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	2000 goto Lcommon;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	2001 Lcommon:
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	2002 addStorageClass();
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	2003 auto tok = token.type;
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	2004 nT();
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	2005 s = new AttributeStatement(tok, parse());
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	2006 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	2007 // 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	2008 //case T.Class:
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	2009 default:
270 764eccdf619d - Fix in parseAttributeStatement(): added checks for T.LParen after const/invariant. aziz parents: 269 diff changeset	2010 case_Declaration:
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	2011 s = new DeclarationStatement(parseDeclaration(stc));
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	2012 }
261 966756c5d5d3 - Added begin variables and calls to set(). aziz parents: 260 diff changeset	2013 set(s, begin);
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	2014 return s;
201 70715b9e2109 - Implemented parseAttributeStatement(). aziz parents: 200 diff changeset	2015 }
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	2016 return parse();
201 70715b9e2109 - Implemented parseAttributeStatement(). aziz parents: 200 diff changeset	2017 }
70715b9e2109 - Implemented parseAttributeStatement(). aziz parents: 200 diff changeset	2018
162 c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	2019 Statement parseIfStatement()
c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	2020 {
c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	2021 assert(token.type == T.If);
c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	2022 nT();
c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	2023
283 df657dd98ffa - Fix: added member type to VariableDeclaration. aziz parents: 282 diff changeset	2024 Statement variable;
162 c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	2025 Expression condition;
c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	2026 Statement ifBody, elseBody;
c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	2027
c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	2028 require(T.LParen);
283 df657dd98ffa - Fix: added member type to VariableDeclaration. aziz parents: 282 diff changeset	2029
df657dd98ffa - Fix: added member type to VariableDeclaration. aziz parents: 282 diff changeset	2030 Token* ident;
484 265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	2031 auto begin = token; // For start of AutoDeclaration or normal Declaration.
162 c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	2032 // auto Identifier = Expression
c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	2033 if (token.type == T.Auto)
c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	2034 {
c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	2035 nT();
253 4279b638c63e - Changed some string types to Token. Adapted parser accordingly. aziz* parents: 252 diff changeset	2036 ident = requireId();
162 c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	2037 require(T.Assign);
283 df657dd98ffa - Fix: added member type to VariableDeclaration. aziz parents: 282 diff changeset	2038 auto init = parseExpression();
484 265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	2039 auto v = new VariableDeclaration(null, [ident], [init]);
265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	2040 set(v, ident);
265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	2041 auto d = new DeclarationStatement(v);
265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	2042 set(d, ident);
265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	2043 variable = new AttributeStatement(T.Auto, d);
265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	2044 set(variable, begin);
162 c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	2045 }
c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	2046 else
c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	2047 {
c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	2048 // Declarator = Expression
237 805796880adb - Fix in parseIfStatement(): require(T.Assign) must be encompassed by a try_() call. aziz parents: 236 diff changeset	2049 Type parseDeclaratorAssign()
162 c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	2050 {
237 805796880adb - Fix in parseIfStatement(): require(T.Assign) must be encompassed by a try_() call. aziz parents: 236 diff changeset	2051 auto type = parseDeclarator(ident);
162 c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	2052 require(T.Assign);
237 805796880adb - Fix in parseIfStatement(): require(T.Assign) must be encompassed by a try_() call. aziz parents: 236 diff changeset	2053 return type;
162 c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	2054 }
237 805796880adb - Fix in parseIfStatement(): require(T.Assign) must be encompassed by a try_() call. aziz parents: 236 diff changeset	2055 bool success;
423 6057113f9a44 Refactored Parser.try_(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 422 diff changeset	2056 auto type = try_(&parseDeclaratorAssign, success);
283 df657dd98ffa - Fix: added member type to VariableDeclaration. aziz parents: 282 diff changeset	2057 if (success)
163 f27a98bb17c7 - Fix: when parsing Declarator fails, type and ident is set to null. aziz parents: 162 diff changeset	2058 {
283 df657dd98ffa - Fix: added member type to VariableDeclaration. aziz parents: 282 diff changeset	2059 auto init = parseExpression();
484 265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	2060 auto v = new VariableDeclaration(type, [ident], [init]);
265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	2061 set(v, begin);
265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	2062 variable = new DeclarationStatement(v);
265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	2063 set(variable, begin);
163 f27a98bb17c7 - Fix: when parsing Declarator fails, type and ident is set to null. aziz parents: 162 diff changeset	2064 }
283 df657dd98ffa - Fix: added member type to VariableDeclaration. aziz parents: 282 diff changeset	2065 else
df657dd98ffa - Fix: added member type to VariableDeclaration. aziz parents: 282 diff changeset	2066 condition = parseExpression();
162 c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	2067 }
c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	2068 require(T.RParen);
164 8ec99326752b - Implemented parseWhileStatement(). aziz parents: 163 diff changeset	2069 ifBody = parseScopeStatement();
162 c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	2070 if (token.type == T.Else)
c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	2071 {
c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	2072 nT();
164 8ec99326752b - Implemented parseWhileStatement(). aziz parents: 163 diff changeset	2073 elseBody = parseScopeStatement();
162 c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	2074 }
283 df657dd98ffa - Fix: added member type to VariableDeclaration. aziz parents: 282 diff changeset	2075 return new IfStatement(variable, condition, ifBody, elseBody);
162 c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	2076 }
c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	2077
164 8ec99326752b - Implemented parseWhileStatement(). aziz parents: 163 diff changeset	2078 Statement parseWhileStatement()
8ec99326752b - Implemented parseWhileStatement(). aziz parents: 163 diff changeset	2079 {
8ec99326752b - Implemented parseWhileStatement(). aziz parents: 163 diff changeset	2080 assert(token.type == T.While);
8ec99326752b - Implemented parseWhileStatement(). aziz parents: 163 diff changeset	2081 nT();
166 56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	2082 require(T.LParen);
164 8ec99326752b - Implemented parseWhileStatement(). aziz parents: 163 diff changeset	2083 auto condition = parseExpression();
166 56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	2084 require(T.RParen);
164 8ec99326752b - Implemented parseWhileStatement(). aziz parents: 163 diff changeset	2085 return new WhileStatement(condition, parseScopeStatement());
8ec99326752b - Implemented parseWhileStatement(). aziz parents: 163 diff changeset	2086 }
8ec99326752b - Implemented parseWhileStatement(). aziz parents: 163 diff changeset	2087
165 797074d143d7 - Implemented parseDoWhileStatement(). aziz parents: 164 diff changeset	2088 Statement parseDoWhileStatement()
797074d143d7 - Implemented parseDoWhileStatement(). aziz parents: 164 diff changeset	2089 {
797074d143d7 - Implemented parseDoWhileStatement(). aziz parents: 164 diff changeset	2090 assert(token.type == T.Do);
797074d143d7 - Implemented parseDoWhileStatement(). aziz parents: 164 diff changeset	2091 nT();
797074d143d7 - Implemented parseDoWhileStatement(). aziz parents: 164 diff changeset	2092 auto doBody = parseScopeStatement();
797074d143d7 - Implemented parseDoWhileStatement(). aziz parents: 164 diff changeset	2093 require(T.While);
166 56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	2094 require(T.LParen);
165 797074d143d7 - Implemented parseDoWhileStatement(). aziz parents: 164 diff changeset	2095 auto condition = parseExpression();
166 56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	2096 require(T.RParen);
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	2097 return new DoWhileStatement(condition, doBody);
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	2098 }
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	2099
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	2100 Statement parseForStatement()
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	2101 {
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	2102 assert(token.type == T.For);
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	2103 nT();
165 797074d143d7 - Implemented parseDoWhileStatement(). aziz parents: 164 diff changeset	2104 require(T.LParen);
166 56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	2105
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	2106 Statement init, forBody;
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	2107 Expression condition, increment;
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	2108
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	2109 if (token.type != T.Semicolon)
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	2110 init = parseNoScopeStatement();
230 8f1790d16753 - Fix: added missing call to parseDeclaratorSuffx() in parseDeclaration. aziz parents: 229 diff changeset	2111 else
8f1790d16753 - Fix: added missing call to parseDeclaratorSuffx() in parseDeclaration. aziz parents: 229 diff changeset	2112 nT(); // Skip ;
166 56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	2113 if (token.type != T.Semicolon)
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	2114 condition = parseExpression();
168 fbbb2434bf6b - Simplified parseForStatement(). aziz parents: 167 diff changeset	2115 require(T.Semicolon);
166 56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	2116 if (token.type != T.RParen)
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	2117 increment = parseExpression();
168 fbbb2434bf6b - Simplified parseForStatement(). aziz parents: 167 diff changeset	2118 require(T.RParen);
167 141b908e32b6 - Fix: forgot parsing forBody. aziz parents: 166 diff changeset	2119 forBody = parseScopeStatement();
166 56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	2120 return new ForStatement(init, condition, increment, forBody);
165 797074d143d7 - Implemented parseDoWhileStatement(). aziz parents: 164 diff changeset	2121 }
797074d143d7 - Implemented parseDoWhileStatement(). aziz parents: 164 diff changeset	2122
169 4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	2123 Statement parseForeachStatement()
4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	2124 {
4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	2125 assert(token.type == T.Foreach \|\| token.type == T.Foreach_reverse);
4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	2126 TOK tok = token.type;
4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	2127 nT();
4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	2128
257 6c58366ba1eb - Fix: need to allocate Parameters. aziz parents: 256 diff changeset	2129 auto params = new Parameters;
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	2130 Expression e; // Aggregate or LwrExpression
169 4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	2131
4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	2132 require(T.LParen);
4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	2133 while (1)
4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	2134 {
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	2135 auto paramBegin = token;
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	2136 Token* stcTok;
169 4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	2137 Type type;
253 4279b638c63e - Changed some string types to Token. Adapted parser accordingly. aziz* parents: 252 diff changeset	2138 Token* ident;
169 4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	2139
4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	2140 switch (token.type)
4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	2141 {
236 e961d1b957c3 - Fix in parseForeachStatement(): added T.Inout to case T.Ref; removed break statement. aziz parents: 235 diff changeset	2142 case T.Ref, T.Inout:
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	2143 stcTok = token;
169 4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	2144 nT();
236 e961d1b957c3 - Fix in parseForeachStatement(): added T.Inout to case T.Ref; removed break statement. aziz parents: 235 diff changeset	2145 // fall through
169 4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	2146 case T.Identifier:
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	2147 auto next = peekNext();
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	2148 if (next == T.Comma \|\| next == T.Semicolon \|\| next == T.RParen)
169 4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	2149 {
253 4279b638c63e - Changed some string types to Token. Adapted parser accordingly. aziz* parents: 252 diff changeset	2150 ident = token;
169 4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	2151 nT();
4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	2152 break;
4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	2153 }
4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	2154 // fall through
4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	2155 default:
4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	2156 type = parseDeclarator(ident);
4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	2157 }
4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	2158
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	2159 params ~= set(new Parameter(stcTok, type, ident, null), paramBegin);
169 4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	2160
4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	2161 if (token.type != T.Comma)
4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	2162 break;
4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	2163 nT();
4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	2164 }
4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	2165 require(T.Semicolon);
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	2166 e = parseExpression();
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	2167 version(D2)
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	2168 { //Foreach (ForeachType; LwrExpression .. UprExpression ) ScopeStatement
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	2169 if (token.type == T.Slice)
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	2170 {
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	2171 // if (params.length != 1)
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	2172 // error(MID.XYZ); // TODO: issue error msg
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	2173 nT();
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	2174 auto upper = parseExpression();
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	2175 require(T.RParen);
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	2176 auto forBody = parseScopeStatement();
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	2177 return new ForeachRangeStatement(tok, params, e, upper, forBody);
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	2178 }
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	2179 }
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	2180 // Foreach (ForeachTypeList; Aggregate) ScopeStatement
169 4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	2181 require(T.RParen);
4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	2182 auto forBody = parseScopeStatement();
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	2183 return new ForeachStatement(tok, params, e, forBody);
169 4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	2184 }
4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	2185
170 a63696d1c474 - Implemented parseSwitchStatement(). aziz parents: 169 diff changeset	2186 Statement parseSwitchStatement()
a63696d1c474 - Implemented parseSwitchStatement(). aziz parents: 169 diff changeset	2187 {
a63696d1c474 - Implemented parseSwitchStatement(). aziz parents: 169 diff changeset	2188 assert(token.type == T.Switch);
a63696d1c474 - Implemented parseSwitchStatement(). aziz parents: 169 diff changeset	2189 nT();
a63696d1c474 - Implemented parseSwitchStatement(). aziz parents: 169 diff changeset	2190
a63696d1c474 - Implemented parseSwitchStatement(). aziz parents: 169 diff changeset	2191 require(T.LParen);
a63696d1c474 - Implemented parseSwitchStatement(). aziz parents: 169 diff changeset	2192 auto condition = parseExpression();
a63696d1c474 - Implemented parseSwitchStatement(). aziz parents: 169 diff changeset	2193 require(T.RParen);
a63696d1c474 - Implemented parseSwitchStatement(). aziz parents: 169 diff changeset	2194 auto switchBody = parseScopeStatement();
a63696d1c474 - Implemented parseSwitchStatement(). aziz parents: 169 diff changeset	2195 return new SwitchStatement(condition, switchBody);
a63696d1c474 - Implemented parseSwitchStatement(). aziz parents: 169 diff changeset	2196 }
a63696d1c474 - Implemented parseSwitchStatement(). aziz parents: 169 diff changeset	2197
220 0c647e319b8e - Removed assert from parseStatement(). aziz parents: 219 diff changeset	2198 Statement parseCaseDefaultBody()
0c647e319b8e - Removed assert from parseStatement(). aziz parents: 219 diff changeset	2199 {
0c647e319b8e - Removed assert from parseStatement(). aziz parents: 219 diff changeset	2200 // This function is similar to parseNoScopeStatement()
224 f838a37a25bd - Fixed parseCaseDefaultBody(). aziz parents: 223 diff changeset	2201 auto s = new Statements();
f838a37a25bd - Fixed parseCaseDefaultBody(). aziz parents: 223 diff changeset	2202 while (token.type != T.Case &&
f838a37a25bd - Fixed parseCaseDefaultBody(). aziz parents: 223 diff changeset	2203 token.type != T.Default &&
f838a37a25bd - Fixed parseCaseDefaultBody(). aziz parents: 223 diff changeset	2204 token.type != T.RBrace &&
f838a37a25bd - Fixed parseCaseDefaultBody(). aziz parents: 223 diff changeset	2205 token.type != T.EOF)
f838a37a25bd - Fixed parseCaseDefaultBody(). aziz parents: 223 diff changeset	2206 s ~= parseStatement();
220 0c647e319b8e - Removed assert from parseStatement(). aziz parents: 219 diff changeset	2207 return new ScopeStatement(s);
0c647e319b8e - Removed assert from parseStatement(). aziz parents: 219 diff changeset	2208 }
0c647e319b8e - Removed assert from parseStatement(). aziz parents: 219 diff changeset	2209
171 f1fa9bbdb4cb - Implemented parseCaseStatement(). aziz parents: 170 diff changeset	2210 Statement parseCaseStatement()
f1fa9bbdb4cb - Implemented parseCaseStatement(). aziz parents: 170 diff changeset	2211 {
f1fa9bbdb4cb - Implemented parseCaseStatement(). aziz parents: 170 diff changeset	2212 assert(token.type == T.Case);
f1fa9bbdb4cb - Implemented parseCaseStatement(). aziz parents: 170 diff changeset	2213 // T.Case skipped in do-while.
f1fa9bbdb4cb - Implemented parseCaseStatement(). aziz parents: 170 diff changeset	2214 Expression[] values;
f1fa9bbdb4cb - Implemented parseCaseStatement(). aziz parents: 170 diff changeset	2215 do
f1fa9bbdb4cb - Implemented parseCaseStatement(). aziz parents: 170 diff changeset	2216 {
f1fa9bbdb4cb - Implemented parseCaseStatement(). aziz parents: 170 diff changeset	2217 nT();
f1fa9bbdb4cb - Implemented parseCaseStatement(). aziz parents: 170 diff changeset	2218 values ~= parseAssignExpression();
f1fa9bbdb4cb - Implemented parseCaseStatement(). aziz parents: 170 diff changeset	2219 } while (token.type == T.Comma)
f1fa9bbdb4cb - Implemented parseCaseStatement(). aziz parents: 170 diff changeset	2220 require(T.Colon);
f1fa9bbdb4cb - Implemented parseCaseStatement(). aziz parents: 170 diff changeset	2221
220 0c647e319b8e - Removed assert from parseStatement(). aziz parents: 219 diff changeset	2222 auto caseBody = parseCaseDefaultBody();
171 f1fa9bbdb4cb - Implemented parseCaseStatement(). aziz parents: 170 diff changeset	2223 return new CaseStatement(values, caseBody);
f1fa9bbdb4cb - Implemented parseCaseStatement(). aziz parents: 170 diff changeset	2224 }
f1fa9bbdb4cb - Implemented parseCaseStatement(). aziz parents: 170 diff changeset	2225
172 89d4519bd8a1 - Implemented parseDefaultStatement(). aziz parents: 171 diff changeset	2226 Statement parseDefaultStatement()
89d4519bd8a1 - Implemented parseDefaultStatement(). aziz parents: 171 diff changeset	2227 {
89d4519bd8a1 - Implemented parseDefaultStatement(). aziz parents: 171 diff changeset	2228 assert(token.type == T.Default);
89d4519bd8a1 - Implemented parseDefaultStatement(). aziz parents: 171 diff changeset	2229 nT();
89d4519bd8a1 - Implemented parseDefaultStatement(). aziz parents: 171 diff changeset	2230 require(T.Colon);
220 0c647e319b8e - Removed assert from parseStatement(). aziz parents: 219 diff changeset	2231 return new DefaultStatement(parseCaseDefaultBody());
172 89d4519bd8a1 - Implemented parseDefaultStatement(). aziz parents: 171 diff changeset	2232 }
89d4519bd8a1 - Implemented parseDefaultStatement(). aziz parents: 171 diff changeset	2233
173 c2714ba44350 - Implemented parseContinueStatement(). aziz parents: 172 diff changeset	2234 Statement parseContinueStatement()
c2714ba44350 - Implemented parseContinueStatement(). aziz parents: 172 diff changeset	2235 {
c2714ba44350 - Implemented parseContinueStatement(). aziz parents: 172 diff changeset	2236 assert(token.type == T.Continue);
c2714ba44350 - Implemented parseContinueStatement(). aziz parents: 172 diff changeset	2237 nT();
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	2238 Token* ident;
173 c2714ba44350 - Implemented parseContinueStatement(). aziz parents: 172 diff changeset	2239 if (token.type == T.Identifier)
c2714ba44350 - Implemented parseContinueStatement(). aziz parents: 172 diff changeset	2240 {
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	2241 ident = token;
173 c2714ba44350 - Implemented parseContinueStatement(). aziz parents: 172 diff changeset	2242 nT();
c2714ba44350 - Implemented parseContinueStatement(). aziz parents: 172 diff changeset	2243 }
c2714ba44350 - Implemented parseContinueStatement(). aziz parents: 172 diff changeset	2244 require(T.Semicolon);
c2714ba44350 - Implemented parseContinueStatement(). aziz parents: 172 diff changeset	2245 return new ContinueStatement(ident);
c2714ba44350 - Implemented parseContinueStatement(). aziz parents: 172 diff changeset	2246 }
c2714ba44350 - Implemented parseContinueStatement(). aziz parents: 172 diff changeset	2247
174 e51c9ee66ea0 - Implemented parseBreakStatement(). aziz parents: 173 diff changeset	2248 Statement parseBreakStatement()
e51c9ee66ea0 - Implemented parseBreakStatement(). aziz parents: 173 diff changeset	2249 {
e51c9ee66ea0 - Implemented parseBreakStatement(). aziz parents: 173 diff changeset	2250 assert(token.type == T.Break);
e51c9ee66ea0 - Implemented parseBreakStatement(). aziz parents: 173 diff changeset	2251 nT();
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	2252 Token* ident;
174 e51c9ee66ea0 - Implemented parseBreakStatement(). aziz parents: 173 diff changeset	2253 if (token.type == T.Identifier)
e51c9ee66ea0 - Implemented parseBreakStatement(). aziz parents: 173 diff changeset	2254 {
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	2255 ident = token;
174 e51c9ee66ea0 - Implemented parseBreakStatement(). aziz parents: 173 diff changeset	2256 nT();
e51c9ee66ea0 - Implemented parseBreakStatement(). aziz parents: 173 diff changeset	2257 }
e51c9ee66ea0 - Implemented parseBreakStatement(). aziz parents: 173 diff changeset	2258 require(T.Semicolon);
e51c9ee66ea0 - Implemented parseBreakStatement(). aziz parents: 173 diff changeset	2259 return new BreakStatement(ident);
e51c9ee66ea0 - Implemented parseBreakStatement(). aziz parents: 173 diff changeset	2260 }
e51c9ee66ea0 - Implemented parseBreakStatement(). aziz parents: 173 diff changeset	2261
175 522df6f0f230 - Implemented parseReturnStatement(). aziz parents: 174 diff changeset	2262 Statement parseReturnStatement()
522df6f0f230 - Implemented parseReturnStatement(). aziz parents: 174 diff changeset	2263 {
522df6f0f230 - Implemented parseReturnStatement(). aziz parents: 174 diff changeset	2264 assert(token.type == T.Return);
522df6f0f230 - Implemented parseReturnStatement(). aziz parents: 174 diff changeset	2265 nT();
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	2266 Expression expr;
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	2267 if (token.type != T.Semicolon)
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	2268 expr = parseExpression();
175 522df6f0f230 - Implemented parseReturnStatement(). aziz parents: 174 diff changeset	2269 require(T.Semicolon);
522df6f0f230 - Implemented parseReturnStatement(). aziz parents: 174 diff changeset	2270 return new ReturnStatement(expr);
522df6f0f230 - Implemented parseReturnStatement(). aziz parents: 174 diff changeset	2271 }
522df6f0f230 - Implemented parseReturnStatement(). aziz parents: 174 diff changeset	2272
176 3071522c0cf0 - Implemented parseGotoStatement(). aziz parents: 175 diff changeset	2273 Statement parseGotoStatement()
3071522c0cf0 - Implemented parseGotoStatement(). aziz parents: 175 diff changeset	2274 {
3071522c0cf0 - Implemented parseGotoStatement(). aziz parents: 175 diff changeset	2275 assert(token.type == T.Goto);
3071522c0cf0 - Implemented parseGotoStatement(). aziz parents: 175 diff changeset	2276 nT();
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	2277 Token* ident;
176 3071522c0cf0 - Implemented parseGotoStatement(). aziz parents: 175 diff changeset	2278 Expression caseExpr;
3071522c0cf0 - Implemented parseGotoStatement(). aziz parents: 175 diff changeset	2279 switch (token.type)
3071522c0cf0 - Implemented parseGotoStatement(). aziz parents: 175 diff changeset	2280 {
3071522c0cf0 - Implemented parseGotoStatement(). aziz parents: 175 diff changeset	2281 case T.Case:
3071522c0cf0 - Implemented parseGotoStatement(). aziz parents: 175 diff changeset	2282 nT();
3071522c0cf0 - Implemented parseGotoStatement(). aziz parents: 175 diff changeset	2283 if (token.type == T.Semicolon)
3071522c0cf0 - Implemented parseGotoStatement(). aziz parents: 175 diff changeset	2284 break;
3071522c0cf0 - Implemented parseGotoStatement(). aziz parents: 175 diff changeset	2285 caseExpr = parseExpression();
3071522c0cf0 - Implemented parseGotoStatement(). aziz parents: 175 diff changeset	2286 break;
3071522c0cf0 - Implemented parseGotoStatement(). aziz parents: 175 diff changeset	2287 case T.Default:
3071522c0cf0 - Implemented parseGotoStatement(). aziz parents: 175 diff changeset	2288 nT();
3071522c0cf0 - Implemented parseGotoStatement(). aziz parents: 175 diff changeset	2289 break;
3071522c0cf0 - Implemented parseGotoStatement(). aziz parents: 175 diff changeset	2290 default:
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	2291 ident = requireId();
176 3071522c0cf0 - Implemented parseGotoStatement(). aziz parents: 175 diff changeset	2292 }
3071522c0cf0 - Implemented parseGotoStatement(). aziz parents: 175 diff changeset	2293 require(T.Semicolon);
3071522c0cf0 - Implemented parseGotoStatement(). aziz parents: 175 diff changeset	2294 return new GotoStatement(ident, caseExpr);
3071522c0cf0 - Implemented parseGotoStatement(). aziz parents: 175 diff changeset	2295 }
3071522c0cf0 - Implemented parseGotoStatement(). aziz parents: 175 diff changeset	2296
177 504b1b2f7c93 - Implemented parseWithStatement(). aziz parents: 176 diff changeset	2297 Statement parseWithStatement()
504b1b2f7c93 - Implemented parseWithStatement(). aziz parents: 176 diff changeset	2298 {
504b1b2f7c93 - Implemented parseWithStatement(). aziz parents: 176 diff changeset	2299 assert(token.type == T.With);
504b1b2f7c93 - Implemented parseWithStatement(). aziz parents: 176 diff changeset	2300 nT();
504b1b2f7c93 - Implemented parseWithStatement(). aziz parents: 176 diff changeset	2301 require(T.LParen);
504b1b2f7c93 - Implemented parseWithStatement(). aziz parents: 176 diff changeset	2302 auto expr = parseExpression();
504b1b2f7c93 - Implemented parseWithStatement(). aziz parents: 176 diff changeset	2303 require(T.RParen);
504b1b2f7c93 - Implemented parseWithStatement(). aziz parents: 176 diff changeset	2304 return new WithStatement(expr, parseScopeStatement());
504b1b2f7c93 - Implemented parseWithStatement(). aziz parents: 176 diff changeset	2305 }
504b1b2f7c93 - Implemented parseWithStatement(). aziz parents: 176 diff changeset	2306
178 62718b29679e - Implemented parseSynchronizedStatement(). aziz parents: 177 diff changeset	2307 Statement parseSynchronizedStatement()
62718b29679e - Implemented parseSynchronizedStatement(). aziz parents: 177 diff changeset	2308 {
62718b29679e - Implemented parseSynchronizedStatement(). aziz parents: 177 diff changeset	2309 assert(token.type == T.Synchronized);
62718b29679e - Implemented parseSynchronizedStatement(). aziz parents: 177 diff changeset	2310 nT();
62718b29679e - Implemented parseSynchronizedStatement(). aziz parents: 177 diff changeset	2311 Expression expr;
62718b29679e - Implemented parseSynchronizedStatement(). aziz parents: 177 diff changeset	2312
62718b29679e - Implemented parseSynchronizedStatement(). aziz parents: 177 diff changeset	2313 if (token.type == T.LParen)
62718b29679e - Implemented parseSynchronizedStatement(). aziz parents: 177 diff changeset	2314 {
62718b29679e - Implemented parseSynchronizedStatement(). aziz parents: 177 diff changeset	2315 nT();
62718b29679e - Implemented parseSynchronizedStatement(). aziz parents: 177 diff changeset	2316 expr = parseExpression();
62718b29679e - Implemented parseSynchronizedStatement(). aziz parents: 177 diff changeset	2317 require(T.RParen);
62718b29679e - Implemented parseSynchronizedStatement(). aziz parents: 177 diff changeset	2318 }
62718b29679e - Implemented parseSynchronizedStatement(). aziz parents: 177 diff changeset	2319 return new SynchronizedStatement(expr, parseScopeStatement());
62718b29679e - Implemented parseSynchronizedStatement(). aziz parents: 177 diff changeset	2320 }
62718b29679e - Implemented parseSynchronizedStatement(). aziz parents: 177 diff changeset	2321
179 507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2322 Statement parseTryStatement()
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2323 {
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2324 assert(token.type == T.Try);
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2325 nT();
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2326
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2327 auto tryBody = parseScopeStatement();
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2328 CatchBody[] catchBodies;
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2329 FinallyBody finBody;
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2330
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2331 while (token.type == T.Catch)
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2332 {
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2333 nT();
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2334 Parameter param;
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2335 if (token.type == T.LParen)
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2336 {
229 a88967db063b - Fix: skip T.LParen in parseTryStatement(). aziz parents: 228 diff changeset	2337 nT();
253 4279b638c63e - Changed some string types to Token. Adapted parser accordingly. aziz* parents: 252 diff changeset	2338 Token* ident;
369 27767e203d64 - Added override attribute to ImportParser.start(). aziz parents: 368 diff changeset	2339 auto type = parseDeclarator(ident, true);
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	2340 param = new Parameter(null, type, ident, null);
179 507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2341 require(T.RParen);
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2342 }
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2343 catchBodies ~= new CatchBody(param, parseNoScopeStatement());
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2344 if (param is null)
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2345 break; // This is a LastCatch
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2346 }
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2347
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2348 if (token.type == T.Finally)
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2349 {
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2350 nT();
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2351 finBody = new FinallyBody(parseNoScopeStatement());
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2352 }
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2353
396 0a4619735ce9 Applied fixes to Lexer, Parser and other classes. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 391 diff changeset	2354 if (catchBodies.length == 0 && finBody is null)
179 507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2355 {
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2356 // TODO: issue error msg.
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2357 }
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2358
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2359 return new TryStatement(tryBody, catchBodies, finBody);
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2360 }
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2361
180 d5a67aa578a8 - Implemented parseThrowStatement(). aziz parents: 179 diff changeset	2362 Statement parseThrowStatement()
d5a67aa578a8 - Implemented parseThrowStatement(). aziz parents: 179 diff changeset	2363 {
d5a67aa578a8 - Implemented parseThrowStatement(). aziz parents: 179 diff changeset	2364 assert(token.type == T.Throw);
d5a67aa578a8 - Implemented parseThrowStatement(). aziz parents: 179 diff changeset	2365 nT();
d5a67aa578a8 - Implemented parseThrowStatement(). aziz parents: 179 diff changeset	2366 auto expr = parseExpression();
d5a67aa578a8 - Implemented parseThrowStatement(). aziz parents: 179 diff changeset	2367 require(T.Semicolon);
d5a67aa578a8 - Implemented parseThrowStatement(). aziz parents: 179 diff changeset	2368 return new ThrowStatement(expr);
d5a67aa578a8 - Implemented parseThrowStatement(). aziz parents: 179 diff changeset	2369 }
d5a67aa578a8 - Implemented parseThrowStatement(). aziz parents: 179 diff changeset	2370
181 abfd51142477 - Implemented parseScopeGuardStatement(). aziz parents: 180 diff changeset	2371 Statement parseScopeGuardStatement()
abfd51142477 - Implemented parseScopeGuardStatement(). aziz parents: 180 diff changeset	2372 {
abfd51142477 - Implemented parseScopeGuardStatement(). aziz parents: 180 diff changeset	2373 assert(token.type == T.Scope);
abfd51142477 - Implemented parseScopeGuardStatement(). aziz parents: 180 diff changeset	2374 nT();
abfd51142477 - Implemented parseScopeGuardStatement(). aziz parents: 180 diff changeset	2375 assert(token.type == T.LParen);
abfd51142477 - Implemented parseScopeGuardStatement(). aziz parents: 180 diff changeset	2376 nT();
abfd51142477 - Implemented parseScopeGuardStatement(). aziz parents: 180 diff changeset	2377
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	2378 Token* condition = requireId();
50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	2379 if (condition)
50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	2380 switch (condition.identifier)
181 abfd51142477 - Implemented parseScopeGuardStatement(). aziz parents: 180 diff changeset	2381 {
abfd51142477 - Implemented parseScopeGuardStatement(). aziz parents: 180 diff changeset	2382 case "exit":
abfd51142477 - Implemented parseScopeGuardStatement(). aziz parents: 180 diff changeset	2383 case "success":
abfd51142477 - Implemented parseScopeGuardStatement(). aziz parents: 180 diff changeset	2384 case "failure":
abfd51142477 - Implemented parseScopeGuardStatement(). aziz parents: 180 diff changeset	2385 break;
abfd51142477 - Implemented parseScopeGuardStatement(). aziz parents: 180 diff changeset	2386 default:
abfd51142477 - Implemented parseScopeGuardStatement(). aziz parents: 180 diff changeset	2387 // TODO: issue error msg.
abfd51142477 - Implemented parseScopeGuardStatement(). aziz parents: 180 diff changeset	2388 }
abfd51142477 - Implemented parseScopeGuardStatement(). aziz parents: 180 diff changeset	2389 require(T.RParen);
abfd51142477 - Implemented parseScopeGuardStatement(). aziz parents: 180 diff changeset	2390 Statement scopeBody;
abfd51142477 - Implemented parseScopeGuardStatement(). aziz parents: 180 diff changeset	2391 if (token.type == T.LBrace)
abfd51142477 - Implemented parseScopeGuardStatement(). aziz parents: 180 diff changeset	2392 scopeBody = parseScopeStatement();
abfd51142477 - Implemented parseScopeGuardStatement(). aziz parents: 180 diff changeset	2393 else
abfd51142477 - Implemented parseScopeGuardStatement(). aziz parents: 180 diff changeset	2394 scopeBody = parseNoScopeStatement();
abfd51142477 - Implemented parseScopeGuardStatement(). aziz parents: 180 diff changeset	2395 return new ScopeGuardStatement(condition, scopeBody);
abfd51142477 - Implemented parseScopeGuardStatement(). aziz parents: 180 diff changeset	2396 }
abfd51142477 - Implemented parseScopeGuardStatement(). aziz parents: 180 diff changeset	2397
182 673b355ba0e9 - Implemented parseVolatileStatement(). aziz parents: 181 diff changeset	2398 Statement parseVolatileStatement()
673b355ba0e9 - Implemented parseVolatileStatement(). aziz parents: 181 diff changeset	2399 {
673b355ba0e9 - Implemented parseVolatileStatement(). aziz parents: 181 diff changeset	2400 assert(token.type == T.Volatile);
673b355ba0e9 - Implemented parseVolatileStatement(). aziz parents: 181 diff changeset	2401 nT();
673b355ba0e9 - Implemented parseVolatileStatement(). aziz parents: 181 diff changeset	2402 Statement volatileBody;
673b355ba0e9 - Implemented parseVolatileStatement(). aziz parents: 181 diff changeset	2403 if (token.type == T.Semicolon)
673b355ba0e9 - Implemented parseVolatileStatement(). aziz parents: 181 diff changeset	2404 nT();
673b355ba0e9 - Implemented parseVolatileStatement(). aziz parents: 181 diff changeset	2405 else if (token.type == T.LBrace)
673b355ba0e9 - Implemented parseVolatileStatement(). aziz parents: 181 diff changeset	2406 volatileBody = parseScopeStatement();
673b355ba0e9 - Implemented parseVolatileStatement(). aziz parents: 181 diff changeset	2407 else
219 0d14a09227a4 - Simplified parseScopeStatement(). aziz parents: 218 diff changeset	2408 volatileBody = parseStatement();
182 673b355ba0e9 - Implemented parseVolatileStatement(). aziz parents: 181 diff changeset	2409 return new VolatileStatement(volatileBody);
673b355ba0e9 - Implemented parseVolatileStatement(). aziz parents: 181 diff changeset	2410 }
673b355ba0e9 - Implemented parseVolatileStatement(). aziz parents: 181 diff changeset	2411
184 30a4c8522b09 - Implemented parsePragmaStatement(). aziz parents: 183 diff changeset	2412 Statement parsePragmaStatement()
30a4c8522b09 - Implemented parsePragmaStatement(). aziz parents: 183 diff changeset	2413 {
30a4c8522b09 - Implemented parsePragmaStatement(). aziz parents: 183 diff changeset	2414 assert(token.type == T.Pragma);
30a4c8522b09 - Implemented parsePragmaStatement(). aziz parents: 183 diff changeset	2415 nT();
30a4c8522b09 - Implemented parsePragmaStatement(). aziz parents: 183 diff changeset	2416
245 93d37f874658 - Changed type of pragma identifier to Token. aziz* parents: 244 diff changeset	2417 Token* ident;
184 30a4c8522b09 - Implemented parsePragmaStatement(). aziz parents: 183 diff changeset	2418 Expression[] args;
30a4c8522b09 - Implemented parsePragmaStatement(). aziz parents: 183 diff changeset	2419 Statement pragmaBody;
30a4c8522b09 - Implemented parsePragmaStatement(). aziz parents: 183 diff changeset	2420
30a4c8522b09 - Implemented parsePragmaStatement(). aziz parents: 183 diff changeset	2421 require(T.LParen);
245 93d37f874658 - Changed type of pragma identifier to Token. aziz* parents: 244 diff changeset	2422 ident = requireId();
184 30a4c8522b09 - Implemented parsePragmaStatement(). aziz parents: 183 diff changeset	2423
30a4c8522b09 - Implemented parsePragmaStatement(). aziz parents: 183 diff changeset	2424 if (token.type == T.Comma)
244 829fdb2e2915 - Fix: parsing at least one argument in pragma declarations/statements. aziz parents: 243 diff changeset	2425 {
829fdb2e2915 - Fix: parsing at least one argument in pragma declarations/statements. aziz parents: 243 diff changeset	2426 // Parse at least one argument.
829fdb2e2915 - Fix: parsing at least one argument in pragma declarations/statements. aziz parents: 243 diff changeset	2427 nT();
829fdb2e2915 - Fix: parsing at least one argument in pragma declarations/statements. aziz parents: 243 diff changeset	2428 args ~= parseAssignExpression();
829fdb2e2915 - Fix: parsing at least one argument in pragma declarations/statements. aziz parents: 243 diff changeset	2429 }
829fdb2e2915 - Fix: parsing at least one argument in pragma declarations/statements. aziz parents: 243 diff changeset	2430
829fdb2e2915 - Fix: parsing at least one argument in pragma declarations/statements. aziz parents: 243 diff changeset	2431 if (token.type == T.Comma)
829fdb2e2915 - Fix: parsing at least one argument in pragma declarations/statements. aziz parents: 243 diff changeset	2432 args ~= parseArguments(T.RParen);
184 30a4c8522b09 - Implemented parsePragmaStatement(). aziz parents: 183 diff changeset	2433 else
30a4c8522b09 - Implemented parsePragmaStatement(). aziz parents: 183 diff changeset	2434 require(T.RParen);
30a4c8522b09 - Implemented parsePragmaStatement(). aziz parents: 183 diff changeset	2435
234 5c1111dc8670 - Added method parseNoScopeOrEmptyStatement(). aziz parents: 233 diff changeset	2436 pragmaBody = parseNoScopeOrEmptyStatement();
184 30a4c8522b09 - Implemented parsePragmaStatement(). aziz parents: 183 diff changeset	2437
30a4c8522b09 - Implemented parsePragmaStatement(). aziz parents: 183 diff changeset	2438 return new PragmaStatement(ident, args, pragmaBody);
30a4c8522b09 - Implemented parsePragmaStatement(). aziz parents: 183 diff changeset	2439 }
30a4c8522b09 - Implemented parsePragmaStatement(). aziz parents: 183 diff changeset	2440
186 d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2441 Statement parseStaticIfStatement()
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2442 {
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2443 assert(token.type == T.Static);
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2444 nT();
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2445 assert(token.type == T.If);
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2446 nT();
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2447 Expression condition;
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2448 Statement ifBody, elseBody;
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2449
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2450 require(T.LParen);
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2451 condition = parseExpression();
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2452 require(T.RParen);
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2453 ifBody = parseNoScopeStatement();
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2454 if (token.type == T.Else)
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2455 {
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2456 nT();
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2457 elseBody = parseNoScopeStatement();
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2458 }
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2459 return new StaticIfStatement(condition, ifBody, elseBody);
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2460 }
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2461
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2462 Statement parseStaticAssertStatement()
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2463 {
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2464 assert(token.type == T.Static);
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2465 nT();
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2466 assert(token.type == T.Assert);
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2467 nT();
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2468 Expression condition, message;
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2469 require(T.LParen);
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2470 condition = parseAssignExpression();
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2471 if (token.type == T.Comma)
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2472 {
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2473 nT();
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2474 message = parseAssignExpression();
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2475 }
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2476 require(T.RParen);
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2477 require(T.Semicolon);
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2478 return new StaticAssertStatement(condition, message);
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2479 }
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2480
190 d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2481 Statement parseDebugStatement()
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2482 {
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2483 assert(token.type == T.Debug);
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2484 nT(); // Skip debug keyword.
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2485
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	2486 Token* cond; // debug ( Integer )
50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	2487 // debug ( Identifier )
190 d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2488 Statement debugBody, elseBody;
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2489
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	2490 void parseIdentOrInt(ref Token* tok)
190 d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2491 {
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2492 nT();
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	2493 if (token.type == T.Int32 \|\|
50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	2494 token.type == T.Identifier)
50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	2495 {
50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	2496 tok = token;
50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	2497 nT();
50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	2498 }
190 d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2499 else
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2500 expected(T.Identifier); // TODO: better error msg
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2501 }
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2502
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2503 // if (token.type == T.Assign)
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2504 // {
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2505 // parseIdentOrInt(identSpec, levelSpec);
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2506 // require(T.Semicolon);
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2507 // }
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2508 // else
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2509 {
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2510 // Condition:
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2511 // Integer
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2512 // Identifier
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2513
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2514 // ( Condition )
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2515 if (token.type == T.LParen)
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2516 {
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	2517 parseIdentOrInt(cond);
190 d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2518 require(T.RParen);
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2519 }
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2520
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2521 // debug Statement
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2522 // debug ( Condition ) Statement
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2523 debugBody = parseNoScopeStatement();
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2524
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2525 // else Statement
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2526 if (token.type == T.Else)
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2527 {
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2528 // debug without condition and else body makes no sense
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2529 //if (levelCond == -1 && identCond.length == 0)
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2530 // TODO: issue error msg
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2531 nT();
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2532 elseBody = parseNoScopeStatement();
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2533 }
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2534 }
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2535
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	2536 return new DebugStatement(cond, debugBody, elseBody);
190 d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2537 }
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2538
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2539 Statement parseVersionStatement()
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2540 {
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2541 assert(token.type == T.Version);
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2542
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2543 nT(); // Skip version keyword.
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2544
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	2545 Token* cond; // version ( Integer )
50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	2546 // version ( Identifier )
190 d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2547 Statement versionBody, elseBody;
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2548
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	2549 void parseIdentOrInt(ref Token* tok)
190 d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2550 {
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	2551 if (token.type == T.Int32 \|\|
50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	2552 token.type == T.Identifier)
50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	2553 {
50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	2554 tok = token;
50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	2555 nT();
50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	2556 }
190 d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2557 else
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2558 expected(T.Identifier); // TODO: better error msg
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2559 }
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2560
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2561 // if (token.type == T.Assign)
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2562 // {
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2563 // parseIdentOrInt(identSpec, levelSpec);
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2564 // require(T.Semicolon);
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2565 // }
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2566 // else
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2567 {
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2568 // Condition:
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2569 // Integer
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2570 // Identifier
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2571
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2572 // ( Condition )
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2573 require(T.LParen);
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	2574 parseIdentOrInt(cond);
190 d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2575 require(T.RParen);
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2576
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2577 // version ( Condition ) Statement
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2578 versionBody = parseNoScopeStatement();
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2579
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2580 // else Statement
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2581 if (token.type == T.Else)
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2582 {
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2583 nT();
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2584 elseBody = parseNoScopeStatement();
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2585 }
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2586 }
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2587
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	2588 return new VersionStatement(cond, versionBody, elseBody);
190 d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2589 }
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2590
161 82c5cfc7d6d3 - Started implementation of parsing statements. aziz parents: 160 diff changeset	2591 /+++++++++++++++++++++++++++++
183 c9df82f6f6be - Added parseAsmStatement() stub. aziz parents: 182 diff changeset	2592 + Assembler parsing methods +
c9df82f6f6be - Added parseAsmStatement() stub. aziz parents: 182 diff changeset	2593 +++++++++++++++++++++++++++++/
c9df82f6f6be - Added parseAsmStatement() stub. aziz parents: 182 diff changeset	2594
c9df82f6f6be - Added parseAsmStatement() stub. aziz parents: 182 diff changeset	2595 Statement parseAsmStatement()
c9df82f6f6be - Added parseAsmStatement() stub. aziz parents: 182 diff changeset	2596 {
c9df82f6f6be - Added parseAsmStatement() stub. aziz parents: 182 diff changeset	2597 assert(token.type == T.Asm);
285 104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2598 nT(); // Skip asm keyword.
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2599 require(T.LBrace);
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2600 auto ss = new Statements;
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2601 while (token.type != T.RBrace && token.type != T.EOF)
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2602 ss ~= parseAsmInstruction();
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2603 require(T.RBrace);
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2604 return new AsmStatement(ss);
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2605 }
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2606
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2607 Statement parseAsmInstruction()
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2608 {
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2609 auto begin = token;
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2610 Statement s;
374 6d22f0b6a674 - Added class AsmAlignStatement. aziz parents: 369 diff changeset	2611 typeof(token) ident;
285 104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2612 switch (token.type)
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2613 {
374 6d22f0b6a674 - Added class AsmAlignStatement. aziz parents: 369 diff changeset	2614 // Keywords that are valid opcodes.
6d22f0b6a674 - Added class AsmAlignStatement. aziz parents: 369 diff changeset	2615 case T.In, T.Int, T.Out:
6d22f0b6a674 - Added class AsmAlignStatement. aziz parents: 369 diff changeset	2616 ident = token;
6d22f0b6a674 - Added class AsmAlignStatement. aziz parents: 369 diff changeset	2617 nT();
6d22f0b6a674 - Added class AsmAlignStatement. aziz parents: 369 diff changeset	2618 goto LOpcode;
285 104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2619 case T.Identifier:
374 6d22f0b6a674 - Added class AsmAlignStatement. aziz parents: 369 diff changeset	2620 ident = token;
6d22f0b6a674 - Added class AsmAlignStatement. aziz parents: 369 diff changeset	2621 nT(); // Skip Identifier
6d22f0b6a674 - Added class AsmAlignStatement. aziz parents: 369 diff changeset	2622 if (token.type == T.Colon)
285 104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2623 {
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2624 // Identifier : AsmInstruction
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2625 nT(); // Skip :
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2626 s = new LabeledStatement(ident, parseAsmInstruction());
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2627 break;
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
374 6d22f0b6a674 - Added class AsmAlignStatement. aziz parents: 369 diff changeset	2630 LOpcode:
285 104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2631 // Opcode ;
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2632 // Opcode Operands ;
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2633 // Opcode
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2634 // Identifier
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2635 Expression[] es;
374 6d22f0b6a674 - Added class AsmAlignStatement. aziz parents: 369 diff changeset	2636 if (token.type != T.Semicolon)
285 104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2637 {
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2638 while (1)
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2639 {
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2640 es ~= parseAsmExpression();
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2641 if (token.type != T.Comma)
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2642 break;
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2643 nT();
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2644 }
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2645 }
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2646 require(T.Semicolon);
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2647 s = new AsmInstruction(ident, es);
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2648 break;
374 6d22f0b6a674 - Added class AsmAlignStatement. aziz parents: 369 diff changeset	2649 case T.Align:
6d22f0b6a674 - Added class AsmAlignStatement. aziz parents: 369 diff changeset	2650 nT();
6d22f0b6a674 - Added class AsmAlignStatement. aziz parents: 369 diff changeset	2651 auto number = token;
6d22f0b6a674 - Added class AsmAlignStatement. aziz parents: 369 diff changeset	2652 switch (token.type)
6d22f0b6a674 - Added class AsmAlignStatement. aziz parents: 369 diff changeset	2653 {
6d22f0b6a674 - Added class AsmAlignStatement. aziz parents: 369 diff changeset	2654 case T.Int32, T.Int64, T.Uint32, T.Uint64:
6d22f0b6a674 - Added class AsmAlignStatement. aziz parents: 369 diff changeset	2655 number = token; nT(); break;
6d22f0b6a674 - Added class AsmAlignStatement. aziz parents: 369 diff changeset	2656 default:
6d22f0b6a674 - Added class AsmAlignStatement. aziz parents: 369 diff changeset	2657 if (token.type != T.Semicolon)
6d22f0b6a674 - Added class AsmAlignStatement. aziz parents: 369 diff changeset	2658 nT();
6d22f0b6a674 - Added class AsmAlignStatement. aziz parents: 369 diff changeset	2659 number = null;
6d22f0b6a674 - Added class AsmAlignStatement. aziz parents: 369 diff changeset	2660 // TODO: report error: number expected after asm align statement.
6d22f0b6a674 - Added class AsmAlignStatement. aziz parents: 369 diff changeset	2661 error(MID.ExpectedButFound, "integer", token.srcText);
6d22f0b6a674 - Added class AsmAlignStatement. aziz parents: 369 diff changeset	2662 }
6d22f0b6a674 - Added class AsmAlignStatement. aziz parents: 369 diff changeset	2663 require(T.Semicolon);
6d22f0b6a674 - Added class AsmAlignStatement. aziz parents: 369 diff changeset	2664 s = new AsmAlignStatement(number);
6d22f0b6a674 - Added class AsmAlignStatement. aziz parents: 369 diff changeset	2665 break;
285 104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2666 case T.Semicolon:
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2667 s = new EmptyStatement();
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2668 nT();
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2669 break;
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2670 default:
374 6d22f0b6a674 - Added class AsmAlignStatement. aziz parents: 369 diff changeset	2671 error(MID.ExpectedButFound, "AsmInstruction", token.srcText);
285 104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2672 s = new IllegalAsmInstruction(token);
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2673 nT();
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2674 }
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2675 set(s, begin);
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2676 return s;
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2677 }
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2678
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2679 Expression parseAsmExpression()
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2680 {
287 211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2681 auto begin = token;
374 6d22f0b6a674 - Added class AsmAlignStatement. aziz parents: 369 diff changeset	2682 auto e = parseAsmOrOrExpression();
287 211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2683 if (token.type == T.Question)
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2684 {
293 418c6548ce17 - Assigning to Node.children in several constructors that inherit from Node. aziz parents: 292 diff changeset	2685 auto tok = token;
287 211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2686 nT();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2687 auto iftrue = parseAsmExpression();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2688 require(T.Colon);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2689 auto iffalse = parseAsmExpression();
293 418c6548ce17 - Assigning to Node.children in several constructors that inherit from Node. aziz parents: 292 diff changeset	2690 e = new CondExpression(e, iftrue, iffalse, tok);
287 211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2691 set(e, begin);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2692 }
288 833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2693 // TODO: create AsmExpression that contains e?
287 211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2694 return e;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2695 }
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2696
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2697 Expression parseAsmOrOrExpression()
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2698 {
375 0bd21b746a04 - Added code to main() for recognizing options to the importgraph command. aziz parents: 374 diff changeset	2699 alias parseAsmAndAndExpression parseNext;
287 211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2700 auto begin = token;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2701 auto e = parseNext();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2702 while (token.type == T.OrLogical)
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2703 {
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2704 auto tok = token;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2705 nT();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2706 e = new OrOrExpression(e, parseNext(), tok);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2707 set(e, begin);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2708 }
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2709 return e;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2710 }
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2711
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2712 Expression parseAsmAndAndExpression()
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2713 {
375 0bd21b746a04 - Added code to main() for recognizing options to the importgraph command. aziz parents: 374 diff changeset	2714 alias parseAsmOrExpression parseNext;
287 211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2715 auto begin = token;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2716 auto e = parseNext();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2717 while (token.type == T.AndLogical)
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2718 {
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2719 auto tok = token;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2720 nT();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2721 e = new AndAndExpression(e, parseNext(), tok);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2722 set(e, begin);
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 return e;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2725 }
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2726
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2727 Expression parseAsmOrExpression()
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2728 {
375 0bd21b746a04 - Added code to main() for recognizing options to the importgraph command. aziz parents: 374 diff changeset	2729 alias parseAsmXorExpression parseNext;
287 211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2730 auto begin = token;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2731 auto e = parseNext();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2732 while (token.type == T.OrBinary)
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2733 {
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2734 auto tok = token;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2735 nT();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2736 e = new OrExpression(e, parseNext(), tok);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2737 set(e, begin);
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 return e;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2740 }
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2741
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2742 Expression parseAsmXorExpression()
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 alias parseAsmAndExpression parseNext;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2745 auto begin = token;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2746 auto e = parseNext();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2747 while (token.type == T.Xor)
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2748 {
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2749 auto tok = token;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2750 nT();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2751 e = new XorExpression(e, parseNext(), tok);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2752 set(e, begin);
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 return e;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2755 }
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2756
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2757 Expression parseAsmAndExpression()
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 alias parseAsmCmpExpression parseNext;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2760 auto begin = token;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2761 auto e = parseNext();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2762 while (token.type == T.AndBinary)
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 auto tok = token;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2765 nT();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2766 e = new AndExpression(e, parseNext(), tok);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2767 set(e, begin);
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 return e;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2770 }
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2771
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2772 Expression parseAsmCmpExpression()
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 alias parseAsmShiftExpression parseNext;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2775 auto begin = token;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2776 auto e = parseNext();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2777
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2778 auto operator = token;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2779 switch (operator.type)
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2780 {
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2781 case T.Equal, T.NotEqual:
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2782 nT();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2783 e = new EqualExpression(e, parseNext(), operator);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2784 break;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2785 case T.LessEqual, T.Less, T.GreaterEqual, T.Greater:
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2786 nT();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2787 e = new RelExpression(e, parseNext(), operator);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2788 break;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2789 default:
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2790 return e;
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 set(e, begin);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2793 return e;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2794 }
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2795
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2796 Expression parseAsmShiftExpression()
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 alias parseAsmAddExpression parseNext;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2799 auto begin = token;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2800 auto e = parseNext();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2801 while (1)
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2802 {
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2803 auto operator = token;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2804 switch (operator.type)
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2805 {
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2806 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	2807 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	2808 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	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 }
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2814 assert(0);
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
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2817 Expression parseAsmAddExpression()
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2818 {
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2819 alias parseAsmMulExpression parseNext;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2820 auto begin = token;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2821 auto e = parseNext();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2822 while (1)
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2823 {
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2824 auto operator = token;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2825 switch (operator.type)
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2826 {
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2827 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	2828 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	2829 // Not allowed in asm
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2830 //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	2831 default:
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2832 return e;
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 set(e, begin);
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 assert(0);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2837 }
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 Expression parseAsmMulExpression()
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2840 {
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2841 alias parseAsmPostExpression parseNext;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2842 auto begin = token;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2843 auto e = parseNext();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2844 while (1)
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2845 {
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2846 auto operator = token;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2847 switch (operator.type)
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2848 {
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2849 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	2850 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	2851 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	2852 default:
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2853 return e;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2854 }
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2855 set(e, begin);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2856 }
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2857 assert(0);
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
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2860 Expression parseAsmPostExpression()
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2861 {
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 = parseAsmUnaryExpression();
374 6d22f0b6a674 - Added class AsmAlignStatement. aziz parents: 369 diff changeset	2864 while (token.type == T.LBracket)
287 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 nT();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2867 e = parseAsmExpression();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2868 e = new AsmPostBracketExpression(e);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2869 require(T.RBracket);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2870 set(e, begin);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2871 }
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2872 return e;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2873 }
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 Expression parseAsmUnaryExpression()
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 auto begin = token;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2878 Expression e;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2879 switch (token.type)
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2880 {
374 6d22f0b6a674 - Added class AsmAlignStatement. aziz parents: 369 diff changeset	2881 case T.Byte, T.Short, T.Int,
6d22f0b6a674 - Added class AsmAlignStatement. aziz parents: 369 diff changeset	2882 T.Float, T.Double, T.Real:
6d22f0b6a674 - Added class AsmAlignStatement. aziz parents: 369 diff changeset	2883 goto LAsmTypePrefix;
287 211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2884 case T.Identifier:
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2885 switch (token.identifier)
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2886 {
374 6d22f0b6a674 - Added class AsmAlignStatement. aziz parents: 369 diff changeset	2887 case "near", "far", /"byte", "short", "int",/
396 0a4619735ce9 Applied fixes to Lexer, Parser and other classes. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 391 diff changeset	2888 "word", "dword", "qword"/, "float", "double", "real"/:
374 6d22f0b6a674 - Added class AsmAlignStatement. aziz parents: 369 diff changeset	2889 LAsmTypePrefix:
287 211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2890 nT();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2891 if (token.type == T.Identifier && token.identifier == "ptr")
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2892 nT();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2893 else
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2894 error(MID.ExpectedButFound, "ptr", token.srcText);
374 6d22f0b6a674 - Added class AsmAlignStatement. aziz parents: 369 diff changeset	2895 e = new AsmTypeExpression(parseAsmExpression());
287 211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2896 break;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2897 case "offset":
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2898 nT();
374 6d22f0b6a674 - Added class AsmAlignStatement. aziz parents: 369 diff changeset	2899 e = new AsmOffsetExpression(parseAsmExpression());
287 211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2900 break;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2901 case "seg":
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2902 nT();
374 6d22f0b6a674 - Added class AsmAlignStatement. aziz parents: 369 diff changeset	2903 e = new AsmSegExpression(parseAsmExpression());
287 211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2904 break;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2905 default:
374 6d22f0b6a674 - Added class AsmAlignStatement. aziz parents: 369 diff changeset	2906 goto LparseAsmPrimaryExpression;
287 211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2907 }
374 6d22f0b6a674 - Added class AsmAlignStatement. aziz parents: 369 diff changeset	2908 break;
287 211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2909 case T.Minus:
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2910 case T.Plus:
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2911 nT();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2912 e = new SignExpression(parseAsmUnaryExpression());
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2913 break;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2914 case T.Not:
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2915 nT();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2916 e = new NotExpression(parseAsmUnaryExpression());
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2917 break;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2918 case T.Tilde:
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2919 nT();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2920 e = new CompExpression(parseAsmUnaryExpression());
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2921 default:
374 6d22f0b6a674 - Added class AsmAlignStatement. aziz parents: 369 diff changeset	2922 LparseAsmPrimaryExpression:
287 211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2923 e = parseAsmPrimaryExpression();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2924 return e;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2925 }
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2926 set(e, begin);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2927 return e;
183 c9df82f6f6be - Added parseAsmStatement() stub. aziz parents: 182 diff changeset	2928 }
c9df82f6f6be - Added parseAsmStatement() stub. aziz parents: 182 diff changeset	2929
285 104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2930 Expression parseAsmPrimaryExpression()
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2931 {
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2932 auto begin = token;
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2933 Expression e;
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2934 switch (token.type)
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2935 {
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2936 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	2937 e = new IntExpression(token.type, token.ulong_);
285 104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2938 nT();
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2939 break;
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2940 case T.Float32, T.Float64, T.Float80,
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2941 T.Imaginary32, T.Imaginary64, T.Imaginary80:
399 ff1d11c27061 Renamed some Expression classes. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 398 diff changeset	2942 e = new RealExpression(token.type, token.real_);
285 104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2943 nT();
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2944 break;
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2945 case T.Dollar:
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2946 e = new DollarExpression();
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2947 nT();
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2948 break;
287 211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2949 case T.LBracket:
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2950 // [ AsmExpression ]
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2951 nT();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2952 e = parseAsmExpression();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2953 require(T.RBracket);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2954 e = new AsmBracketExpression(e);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2955 break;
288 833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2956 case T.Identifier:
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2957 switch (token.identifier)
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2958 {
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2959 // __LOCAL_SIZE
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2960 case "__LOCAL_SIZE":
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2961 e = new AsmLocalSizeExpression();
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2962 nT();
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2963 break;
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2964 // Register
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2965 case "ST":
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2966 auto register = token;
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2967 nT();
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2968 // (1) - (7)
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2969 Token* number;
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2970 if (token.type == T.LParen)
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2971 {
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2972 nT();
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2973 if (token.type == T.Int32)
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2974 {
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2975 number = token;
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2976 nT();
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2977 }
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2978 else
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2979 expected(T.Int32);
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2980 require(T.RParen);
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2981 }
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2982 e = new AsmRegisterExpression(register, number);
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2983 break;
417 8af5c7e2f722 Fixed parsing asm FS register. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 415 diff changeset	2984 case "FS":
8af5c7e2f722 Fixed parsing asm FS register. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 415 diff changeset	2985 auto register = token;
8af5c7e2f722 Fixed parsing asm FS register. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 415 diff changeset	2986 nT();
8af5c7e2f722 Fixed parsing asm FS register. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 415 diff changeset	2987 // TODO: is the colon-number part optional?
8af5c7e2f722 Fixed parsing asm FS register. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 415 diff changeset	2988 Token* number;
8af5c7e2f722 Fixed parsing asm FS register. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 415 diff changeset	2989 if (token.type == T.Colon)
8af5c7e2f722 Fixed parsing asm FS register. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 415 diff changeset	2990 {
8af5c7e2f722 Fixed parsing asm FS register. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 415 diff changeset	2991 // :0, :4, :8
8af5c7e2f722 Fixed parsing asm FS register. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 415 diff changeset	2992 nT();
8af5c7e2f722 Fixed parsing asm FS register. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 415 diff changeset	2993 switch (token.srcText)
8af5c7e2f722 Fixed parsing asm FS register. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 415 diff changeset	2994 {
8af5c7e2f722 Fixed parsing asm FS register. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 415 diff changeset	2995 case "0", "4", "8":
8af5c7e2f722 Fixed parsing asm FS register. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 415 diff changeset	2996 number = token;
8af5c7e2f722 Fixed parsing asm FS register. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 415 diff changeset	2997 nT();
8af5c7e2f722 Fixed parsing asm FS register. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 415 diff changeset	2998 break;
8af5c7e2f722 Fixed parsing asm FS register. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 415 diff changeset	2999 default:
8af5c7e2f722 Fixed parsing asm FS register. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 415 diff changeset	3000 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	3001 }
8af5c7e2f722 Fixed parsing asm FS register. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 415 diff changeset	3002 }
8af5c7e2f722 Fixed parsing asm FS register. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 415 diff changeset	3003 e = new AsmRegisterExpression(register, number);
8af5c7e2f722 Fixed parsing asm FS register. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 415 diff changeset	3004 break;
288 833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	3005 case "AL", "AH", "AX", "EAX",
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	3006 "BL", "BH", "BX", "EBX",
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	3007 "CL", "CH", "CX", "ECX",
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	3008 "DL", "DH", "DX", "EDX",
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	3009 "BP", "EBP",
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	3010 "SP", "ESP",
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	3011 "DI", "EDI",
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	3012 "SI", "ESI",
417 8af5c7e2f722 Fixed parsing asm FS register. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 415 diff changeset	3013 "ES", "CS", "SS", "DS", "GS",
288 833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	3014 "CR0", "CR2", "CR3", "CR4",
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	3015 "DR0", "DR1", "DR2", "DR3", "DR6", "DR7",
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	3016 "TR3", "TR4", "TR5", "TR6", "TR7",
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	3017 "MM0", "MM1", "MM2", "MM3", "MM4", "MM5", "MM6", "MM7",
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	3018 "XMM0", "XMM1", "XMM2", "XMM3", "XMM4", "XMM5", "XMM6", "XMM7":
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	3019 e = new AsmRegisterExpression(token);
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	3020 nT();
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	3021 break;
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	3022 default:
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	3023 // DotIdentifier
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	3024 auto begin2 = token;
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	3025 Expression[] identList;
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	3026 goto LenterLoop;
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	3027 while (token.type == T.Dot)
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	3028 {
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	3029 nT();
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	3030 begin2 = token;
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	3031 auto ident = requireId();
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	3032 LenterLoop:
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	3033 e = new IdentifierExpression(token);
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	3034 nT();
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	3035 set(e, begin2);
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	3036 identList ~= e;
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	3037 }
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	3038 e = new DotListExpression(identList);
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	3039 }
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	3040 break;
285 104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	3041 default:
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	3042 error(MID.ExpectedButFound, "Expression", token.srcText);
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	3043 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	3044 if (!trying)
9c69615a4876 Added method insertEmptyTokenBefore() to Lexer. Made some fixes, too. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 409 diff changeset	3045 {
9c69615a4876 Added method insertEmptyTokenBefore() to Lexer. Made some fixes, too. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 409 diff changeset	3046 // 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	3047 begin = lx.insertEmptyTokenBefore(token);
9c69615a4876 Added method insertEmptyTokenBefore() to Lexer. Made some fixes, too. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 409 diff changeset	3048 prevToken = begin;
9c69615a4876 Added method insertEmptyTokenBefore() to Lexer. Made some fixes, too. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 409 diff changeset	3049 }
285 104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	3050 }
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	3051 set(e, begin);
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	3052 return e;
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	3053 }
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	3054
183 c9df82f6f6be - Added parseAsmStatement() stub. aziz parents: 182 diff changeset	3055 /+++++++++++++++++++++++++++++
102 6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	3056 + Expression parsing methods +
6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	3057 +++++++++++++++++++++++++++++/
6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	3058
72 f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	3059 Expression parseExpression()
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	3060 {
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3061 auto begin = token;
72 f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	3062 auto e = parseAssignExpression();
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	3063 while (token.type == T.Comma)
235 3384ac8878f7 - Fixed parseExpression(). Forgot to skip T.Comma. aziz parents: 234 diff changeset	3064 {
251 67a798459532 - Added parameter Token* tok to some Expression constructors. Adapted parser accordingly. aziz parents: 250 diff changeset	3065 auto comma = token;
235 3384ac8878f7 - Fixed parseExpression(). Forgot to skip T.Comma. aziz parents: 234 diff changeset	3066 nT();
251 67a798459532 - Added parameter Token* tok to some Expression constructors. Adapted parser accordingly. aziz parents: 250 diff changeset	3067 e = new CommaExpression(e, parseAssignExpression(), comma);
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3068 set(e, begin);
235 3384ac8878f7 - Fixed parseExpression(). Forgot to skip T.Comma. aziz parents: 234 diff changeset	3069 }
72 f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	3070 return e;
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	3071 }
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	3072
71 b3777cca323c - Added Identity and NotIdentity tokens. aziz parents: 70 diff changeset	3073 Expression parseAssignExpression()
b3777cca323c - Added Identity and NotIdentity tokens. aziz parents: 70 diff changeset	3074 {
319 83f1f9a4f248 - Removed assigment to 'begin' from loop. Initializing 'begin' at decl point. aziz parents: 318 diff changeset	3075 auto begin = token;
71 b3777cca323c - Added Identity and NotIdentity tokens. aziz parents: 70 diff changeset	3076 auto e = parseCondExpression();
72 f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	3077 while (1)
71 b3777cca323c - Added Identity and NotIdentity tokens. aziz parents: 70 diff changeset	3078 {
87 c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	3079 switch (token.type)
72 f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	3080 {
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	3081 case T.Assign:
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	3082 nT(); e = new AssignExpression(e, parseAssignExpression());
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	3083 break;
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	3084 case T.LShiftAssign:
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	3085 nT(); e = new LShiftAssignExpression(e, parseAssignExpression());
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	3086 break;
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	3087 case T.RShiftAssign:
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	3088 nT(); e = new RShiftAssignExpression(e, parseAssignExpression());
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	3089 break;
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	3090 case T.URShiftAssign:
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	3091 nT(); e = new URShiftAssignExpression(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.OrAssign:
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	3094 nT(); e = new OrAssignExpression(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.AndAssign:
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	3097 nT(); e = new AndAssignExpression(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.PlusAssign:
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	3100 nT(); e = new PlusAssignExpression(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.MinusAssign:
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	3103 nT(); e = new MinusAssignExpression(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.DivAssign:
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	3106 nT(); e = new DivAssignExpression(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.MulAssign:
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	3109 nT(); e = new MulAssignExpression(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.ModAssign:
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	3112 nT(); e = new ModAssignExpression(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.XorAssign:
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	3115 nT(); e = new XorAssignExpression(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.CatAssign:
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	3118 nT(); e = new CatAssignExpression(e, parseAssignExpression());
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	3119 break;
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	3120 default:
218 6c0d274e0f3f - Removed goto from parseAssignExpression(). aziz parents: 217 diff changeset	3121 return e;
72 f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	3122 }
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3123 set(e, begin);
71 b3777cca323c - Added Identity and NotIdentity tokens. aziz parents: 70 diff changeset	3124 }
b3777cca323c - Added Identity and NotIdentity tokens. aziz parents: 70 diff changeset	3125 return e;
b3777cca323c - Added Identity and NotIdentity tokens. aziz parents: 70 diff changeset	3126 }
72 f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	3127
71 b3777cca323c - Added Identity and NotIdentity tokens. aziz parents: 70 diff changeset	3128 Expression parseCondExpression()
b3777cca323c - Added Identity and NotIdentity tokens. aziz parents: 70 diff changeset	3129 {
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3130 auto begin = token;
72 f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	3131 auto e = parseOrOrExpression();
87 c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	3132 if (token.type == T.Question)
72 f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	3133 {
293 418c6548ce17 - Assigning to Node.children in several constructors that inherit from Node. aziz parents: 292 diff changeset	3134 auto tok = token;
72 f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	3135 nT();
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	3136 auto iftrue = parseExpression();
87 c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	3137 require(T.Colon);
72 f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	3138 auto iffalse = parseCondExpression();
293 418c6548ce17 - Assigning to Node.children in several constructors that inherit from Node. aziz parents: 292 diff changeset	3139 e = new CondExpression(e, iftrue, iffalse, tok);
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3140 set(e, begin);
72 f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	3141 }
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	3142 return e;
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	3143 }
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	3144
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	3145 Expression parseOrOrExpression()
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	3146 {
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3147 auto begin = token;
73 11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3148 alias parseAndAndExpression parseNext;
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3149 auto e = parseNext();
223 043722eed46e - Fix: if-statements should be while-statements. aziz parents: 222 diff changeset	3150 while (token.type == T.OrLogical)
73 11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3151 {
251 67a798459532 - Added parameter Token* tok to some Expression constructors. Adapted parser accordingly. aziz parents: 250 diff changeset	3152 auto tok = token;
73 11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3153 nT();
251 67a798459532 - Added parameter Token* tok to some Expression constructors. Adapted parser accordingly. aziz parents: 250 diff changeset	3154 e = new OrOrExpression(e, parseNext(), tok);
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3155 set(e, begin);
73 11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3156 }
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3157 return e;
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3158 }
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3159
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3160 Expression parseAndAndExpression()
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3161 {
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3162 auto begin = token;
73 11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3163 alias parseOrExpression parseNext;
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3164 auto e = parseNext();
223 043722eed46e - Fix: if-statements should be while-statements. aziz parents: 222 diff changeset	3165 while (token.type == T.AndLogical)
73 11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3166 {
251 67a798459532 - Added parameter Token* tok to some Expression constructors. Adapted parser accordingly. aziz parents: 250 diff changeset	3167 auto tok = token;
73 11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3168 nT();
251 67a798459532 - Added parameter Token* tok to some Expression constructors. Adapted parser accordingly. aziz parents: 250 diff changeset	3169 e = new AndAndExpression(e, parseNext(), tok);
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3170 set(e, begin);
73 11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3171 }
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3172 return e;
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3173 }
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3174
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3175 Expression parseOrExpression()
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3176 {
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3177 auto begin = token;
73 11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3178 alias parseXorExpression parseNext;
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3179 auto e = parseNext();
223 043722eed46e - Fix: if-statements should be while-statements. aziz parents: 222 diff changeset	3180 while (token.type == T.OrBinary)
73 11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3181 {
251 67a798459532 - Added parameter Token* tok to some Expression constructors. Adapted parser accordingly. aziz parents: 250 diff changeset	3182 auto tok = token;
73 11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3183 nT();
251 67a798459532 - Added parameter Token* tok to some Expression constructors. Adapted parser accordingly. aziz parents: 250 diff changeset	3184 e = new OrExpression(e, parseNext(), tok);
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3185 set(e, begin);
73 11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3186 }
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3187 return e;
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3188 }
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3189
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3190 Expression parseXorExpression()
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3191 {
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3192 auto begin = token;
73 11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3193 alias parseAndExpression parseNext;
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3194 auto e = parseNext();
223 043722eed46e - Fix: if-statements should be while-statements. aziz parents: 222 diff changeset	3195 while (token.type == T.Xor)
73 11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3196 {
251 67a798459532 - Added parameter Token* tok to some Expression constructors. Adapted parser accordingly. aziz parents: 250 diff changeset	3197 auto tok = token;
73 11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3198 nT();
251 67a798459532 - Added parameter Token* tok to some Expression constructors. Adapted parser accordingly. aziz parents: 250 diff changeset	3199 e = new XorExpression(e, parseNext(), tok);
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3200 set(e, begin);
73 11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3201 }
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3202 return e;
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3203 }
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3204
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3205 Expression parseAndExpression()
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3206 {
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3207 auto begin = token;
73 11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3208 alias parseCmpExpression parseNext;
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3209 auto e = parseNext();
223 043722eed46e - Fix: if-statements should be while-statements. aziz parents: 222 diff changeset	3210 while (token.type == T.AndBinary)
73 11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3211 {
251 67a798459532 - Added parameter Token* tok to some Expression constructors. Adapted parser accordingly. aziz parents: 250 diff changeset	3212 auto tok = token;
73 11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3213 nT();
251 67a798459532 - Added parameter Token* tok to some Expression constructors. Adapted parser accordingly. aziz parents: 250 diff changeset	3214 e = new AndExpression(e, parseNext(), tok);
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3215 set(e, begin);
73 11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3216 }
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3217 return e;
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3218 }
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3219
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3220 Expression parseCmpExpression()
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3221 {
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3222 auto begin = token;
74 30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	3223 auto e = parseShiftExpression();
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	3224
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3225 auto operator = token;
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3226 switch (operator.type)
74 30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	3227 {
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	3228 case T.Equal, T.NotEqual:
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	3229 nT();
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	3230 e = new EqualExpression(e, parseShiftExpression(), operator);
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	3231 break;
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	3232 case T.Not:
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	3233 if (peekNext() != T.Is)
74 30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	3234 break;
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	3235 nT();
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3236 // fall through
225 8883c113c2f1 - Fix: case T.Identity should be T.Is. aziz parents: 224 diff changeset	3237 case T.Is:
74 30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	3238 nT();
83 9e6d66f647c9 - Fix: IsExpression was created instead of IdentityExpression. aziz parents: 81 diff changeset	3239 e = new IdentityExpression(e, parseShiftExpression(), operator);
74 30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	3240 break;
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	3241 case T.LessEqual, T.Less, T.GreaterEqual, T.Greater,
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	3242 T.Unordered, T.UorE, T.UorG, T.UorGorE,
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	3243 T.UorL, T.UorLorE, T.LorEorG, T.LorG:
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	3244 nT();
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	3245 e = new RelExpression(e, parseShiftExpression(), operator);
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	3246 break;
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	3247 case T.In:
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	3248 nT();
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	3249 e = new InExpression(e, parseShiftExpression(), operator);
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	3250 break;
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	3251 default:
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3252 return e;
74 30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	3253 }
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3254 set(e, begin);
74 30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	3255 return e;
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	3256 }
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	3257
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	3258 Expression parseShiftExpression()
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	3259 {
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3260 auto begin = token;
75 3f976d9e0833 - Implemented parseShiftExpression(). aziz parents: 74 diff changeset	3261 auto e = parseAddExpression();
3f976d9e0833 - Implemented parseShiftExpression(). aziz parents: 74 diff changeset	3262 while (1)
3f976d9e0833 - Implemented parseShiftExpression(). aziz parents: 74 diff changeset	3263 {
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3264 auto operator = token;
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3265 switch (operator.type)
75 3f976d9e0833 - Implemented parseShiftExpression(). aziz parents: 74 diff changeset	3266 {
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3267 case T.LShift: nT(); e = new LShiftExpression(e, parseAddExpression(), operator); break;
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3268 case T.RShift: nT(); e = new RShiftExpression(e, parseAddExpression(), operator); break;
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3269 case T.URShift: nT(); e = new URShiftExpression(e, parseAddExpression(), operator); break;
228 a4c5ee9527b7 - Replaced assert(0); with break; in case T.Static. Renamed local t to next. aziz parents: 227 diff changeset	3270 default:
a4c5ee9527b7 - Replaced assert(0); with break; in case T.Static. Renamed local t to next. aziz parents: 227 diff changeset	3271 return e;
75 3f976d9e0833 - Implemented parseShiftExpression(). aziz parents: 74 diff changeset	3272 }
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3273 set(e, begin);
75 3f976d9e0833 - Implemented parseShiftExpression(). aziz parents: 74 diff changeset	3274 }
228 a4c5ee9527b7 - Replaced assert(0); with break; in case T.Static. Renamed local t to next. aziz parents: 227 diff changeset	3275 assert(0);
75 3f976d9e0833 - Implemented parseShiftExpression(). aziz parents: 74 diff changeset	3276 }
3f976d9e0833 - Implemented parseShiftExpression(). aziz parents: 74 diff changeset	3277
3f976d9e0833 - Implemented parseShiftExpression(). aziz parents: 74 diff changeset	3278 Expression parseAddExpression()
3f976d9e0833 - Implemented parseShiftExpression(). aziz parents: 74 diff changeset	3279 {
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3280 auto begin = token;
76 a85f9edf6ce7 - Implemented parseAddExpression(). aziz parents: 75 diff changeset	3281 auto e = parseMulExpression();
a85f9edf6ce7 - Implemented parseAddExpression(). aziz parents: 75 diff changeset	3282 while (1)
a85f9edf6ce7 - Implemented parseAddExpression(). aziz parents: 75 diff changeset	3283 {
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3284 auto operator = token;
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3285 switch (operator.type)
76 a85f9edf6ce7 - Implemented parseAddExpression(). aziz parents: 75 diff changeset	3286 {
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3287 case T.Plus: nT(); e = new PlusExpression(e, parseMulExpression(), operator); break;
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3288 case T.Minus: nT(); e = new MinusExpression(e, parseMulExpression(), operator); break;
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3289 case T.Tilde: nT(); e = new CatExpression(e, parseMulExpression(), operator); break;
228 a4c5ee9527b7 - Replaced assert(0); with break; in case T.Static. Renamed local t to next. aziz parents: 227 diff changeset	3290 default:
a4c5ee9527b7 - Replaced assert(0); with break; in case T.Static. Renamed local t to next. aziz parents: 227 diff changeset	3291 return e;
76 a85f9edf6ce7 - Implemented parseAddExpression(). aziz parents: 75 diff changeset	3292 }
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3293 set(e, begin);
76 a85f9edf6ce7 - Implemented parseAddExpression(). aziz parents: 75 diff changeset	3294 }
228 a4c5ee9527b7 - Replaced assert(0); with break; in case T.Static. Renamed local t to next. aziz parents: 227 diff changeset	3295 assert(0);
76 a85f9edf6ce7 - Implemented parseAddExpression(). aziz parents: 75 diff changeset	3296 }
a85f9edf6ce7 - Implemented parseAddExpression(). aziz parents: 75 diff changeset	3297
a85f9edf6ce7 - Implemented parseAddExpression(). aziz parents: 75 diff changeset	3298 Expression parseMulExpression()
a85f9edf6ce7 - Implemented parseAddExpression(). aziz parents: 75 diff changeset	3299 {
335 b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3300 alias parsePostExpression parseNext;
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3301 auto begin = token;
335 b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3302 auto e = parseNext();
77 7e21c4df1c02 - Implemented parseMulExpression(). aziz parents: 76 diff changeset	3303 while (1)
7e21c4df1c02 - Implemented parseMulExpression(). aziz parents: 76 diff changeset	3304 {
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3305 auto operator = token;
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3306 switch (operator.type)
77 7e21c4df1c02 - Implemented parseMulExpression(). aziz parents: 76 diff changeset	3307 {
335 b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3308 case T.Mul: nT(); e = new MulExpression(e, parseNext(), operator); break;
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3309 case T.Div: nT(); e = new DivExpression(e, parseNext(), operator); break;
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3310 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	3311 default:
a4c5ee9527b7 - Replaced assert(0); with break; in case T.Static. Renamed local t to next. aziz parents: 227 diff changeset	3312 return e;
77 7e21c4df1c02 - Implemented parseMulExpression(). aziz parents: 76 diff changeset	3313 }
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3314 set(e, begin);
77 7e21c4df1c02 - Implemented parseMulExpression(). aziz parents: 76 diff changeset	3315 }
228 a4c5ee9527b7 - Replaced assert(0); with break; in case T.Static. Renamed local t to next. aziz parents: 227 diff changeset	3316 assert(0);
71 b3777cca323c - Added Identity and NotIdentity tokens. aziz parents: 70 diff changeset	3317 }
b3777cca323c - Added Identity and NotIdentity tokens. aziz parents: 70 diff changeset	3318
335 b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3319 Expression parsePostExpression()
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3320 {
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3321 auto begin = token;
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3322 auto e = parseUnaryExpression();
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3323 while (1)
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3324 {
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3325 switch (token.type)
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3326 {
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3327 case T.Dot:
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3328 e = new PostDotListExpression(e, parseDotListExpression());
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3329 goto Lset;
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3330 case T.PlusPlus:
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3331 e = new PostIncrExpression(e);
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3332 break;
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3333 case T.MinusMinus:
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3334 e = new PostDecrExpression(e);
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3335 break;
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3336 case T.LParen:
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3337 e = new CallExpression(e, parseArguments(T.RParen));
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3338 goto Lset;
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3339 case T.LBracket:
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3340 // parse Slice- and IndexExpression
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3341 nT();
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3342 if (token.type == T.RBracket)
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3343 {
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3344 e = new SliceExpression(e, null, null);
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3345 break;
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3346 }
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3347
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3348 Expression[] es = [parseAssignExpression()];
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3349
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3350 if (token.type == T.Slice)
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3351 {
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3352 nT();
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3353 e = new SliceExpression(e, es[0], parseAssignExpression());
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3354 require(T.RBracket);
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3355 goto Lset;
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3356 }
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3357 else if (token.type == T.Comma)
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3358 {
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3359 es ~= parseArguments(T.RBracket);
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3360 }
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3361 else
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3362 require(T.RBracket);
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3363
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3364 e = new IndexExpression(e, es);
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3365 goto Lset;
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3366 default:
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3367 return e;
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3368 }
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3369 nT();
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3370 Lset:
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3371 set(e, begin);
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3372 }
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3373 assert(0);
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3374 }
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3375
91 ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3376 Expression parseUnaryExpression()
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3377 {
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3378 auto begin = token;
91 ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3379 Expression e;
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3380 switch (token.type)
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3381 {
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3382 case T.AndBinary:
257 6c58366ba1eb - Fix: need to allocate Parameters. aziz parents: 256 diff changeset	3383 nT();
243 461e544ebb53 - Added method requireId(). aziz parents: 242 diff changeset	3384 e = new AddressExpression(parseUnaryExpression());
91 ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3385 break;
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3386 case T.PlusPlus:
257 6c58366ba1eb - Fix: need to allocate Parameters. aziz parents: 256 diff changeset	3387 nT();
243 461e544ebb53 - Added method requireId(). aziz parents: 242 diff changeset	3388 e = new PreIncrExpression(parseUnaryExpression());
91 ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3389 break;
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3390 case T.MinusMinus:
257 6c58366ba1eb - Fix: need to allocate Parameters. aziz parents: 256 diff changeset	3391 nT();
243 461e544ebb53 - Added method requireId(). aziz parents: 242 diff changeset	3392 e = new PreDecrExpression(parseUnaryExpression());
91 ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3393 break;
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3394 case T.Mul:
257 6c58366ba1eb - Fix: need to allocate Parameters. aziz parents: 256 diff changeset	3395 nT();
243 461e544ebb53 - Added method requireId(). aziz parents: 242 diff changeset	3396 e = new DerefExpression(parseUnaryExpression());
91 ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3397 break;
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3398 case T.Minus:
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3399 case T.Plus:
257 6c58366ba1eb - Fix: need to allocate Parameters. aziz parents: 256 diff changeset	3400 nT();
243 461e544ebb53 - Added method requireId(). aziz parents: 242 diff changeset	3401 e = new SignExpression(parseUnaryExpression());
91 ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3402 break;
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3403 case T.Not:
257 6c58366ba1eb - Fix: need to allocate Parameters. aziz parents: 256 diff changeset	3404 nT();
243 461e544ebb53 - Added method requireId(). aziz parents: 242 diff changeset	3405 e = new NotExpression(parseUnaryExpression());
91 ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3406 break;
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3407 case T.Tilde:
257 6c58366ba1eb - Fix: need to allocate Parameters. aziz parents: 256 diff changeset	3408 nT();
243 461e544ebb53 - Added method requireId(). aziz parents: 242 diff changeset	3409 e = new CompExpression(parseUnaryExpression());
91 ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3410 break;
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3411 case T.New:
154 0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	3412 e = parseNewExpression();
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3413 return e;
91 ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3414 case T.Delete:
257 6c58366ba1eb - Fix: need to allocate Parameters. aziz parents: 256 diff changeset	3415 nT();
243 461e544ebb53 - Added method requireId(). aziz parents: 242 diff changeset	3416 e = new DeleteExpression(parseUnaryExpression());
91 ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3417 break;
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3418 case T.Cast:
99 6b8c248f5911 - Added member type to classes CastExpression and TypeidExpression. aziz parents: 98 diff changeset	3419 requireNext(T.LParen);
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3420 Type type;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3421 switch (token.type)
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3422 {
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3423 version(D2)
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3424 {
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3425 auto begin2 = token;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3426 case T.Const:
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3427 type = new ConstType(null);
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3428 goto case_break;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3429 case T.Invariant:
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3430 type = new InvariantType(null);
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3431 case_break:
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3432 nT();
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3433 set(type, begin2);
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3434 break;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3435 }
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3436 default:
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3437 type = parseType();
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3438 }
99 6b8c248f5911 - Added member type to classes CastExpression and TypeidExpression. aziz parents: 98 diff changeset	3439 require(T.RParen);
6b8c248f5911 - Added member type to classes CastExpression and TypeidExpression. aziz parents: 98 diff changeset	3440 e = new CastExpression(parseUnaryExpression(), type);
257 6c58366ba1eb - Fix: need to allocate Parameters. aziz parents: 256 diff changeset	3441 break;
91 ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3442 case T.LParen:
102 6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	3443 // ( Type ) . Identifier
225 8883c113c2f1 - Fix: case T.Identity should be T.Is. aziz parents: 224 diff changeset	3444 Type parseType_()
8883c113c2f1 - Fix: case T.Identity should be T.Is. aziz parents: 224 diff changeset	3445 {
8883c113c2f1 - Fix: case T.Identity should be T.Is. aziz parents: 224 diff changeset	3446 nT();
8883c113c2f1 - Fix: case T.Identity should be T.Is. aziz parents: 224 diff changeset	3447 auto type = parseType();
8883c113c2f1 - Fix: case T.Identity should be T.Is. aziz parents: 224 diff changeset	3448 require(T.RParen);
233 c2b601dcd57d - Added assert to parseDotListExpression(). aziz parents: 232 diff changeset	3449 require(T.Dot);
225 8883c113c2f1 - Fix: case T.Identity should be T.Is. aziz parents: 224 diff changeset	3450 return type;
8883c113c2f1 - Fix: case T.Identity should be T.Is. aziz parents: 224 diff changeset	3451 }
8883c113c2f1 - Fix: case T.Identity should be T.Is. aziz parents: 224 diff changeset	3452 bool success;
423 6057113f9a44 Refactored Parser.try_(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 422 diff changeset	3453 auto type = try_(&parseType_, success);
225 8883c113c2f1 - Fix: case T.Identity should be T.Is. aziz parents: 224 diff changeset	3454 if (success)
8883c113c2f1 - Fix: case T.Identity should be T.Is. aziz parents: 224 diff changeset	3455 {
243 461e544ebb53 - Added method requireId(). aziz parents: 242 diff changeset	3456 auto ident = requireId();
225 8883c113c2f1 - Fix: case T.Identity should be T.Is. aziz parents: 224 diff changeset	3457 e = new TypeDotIdExpression(type, ident);
257 6c58366ba1eb - Fix: need to allocate Parameters. aziz parents: 256 diff changeset	3458 break;
225 8883c113c2f1 - Fix: case T.Identity should be T.Is. aziz parents: 224 diff changeset	3459 }
8883c113c2f1 - Fix: case T.Identity should be T.Is. aziz parents: 224 diff changeset	3460 goto default;
91 ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3461 default:
335 b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3462 e = parsePrimaryExpression();
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3463 return e;
91 ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3464 }
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3465 assert(e !is null);
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3466 set(e, begin);
91 ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3467 return e;
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3468 }
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3469
79 df4e5c7ad58a - Implemented most of parsePostExpression() and parsePreExpression(). aziz parents: 78 diff changeset	3470 Expression parsePrimaryExpression()
78 f043759fb59a - Added code to parseUnaryExpression(); not fully implemented. aziz parents: 77 diff changeset	3471 {
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3472 auto begin = token;
83 9e6d66f647c9 - Fix: IsExpression was created instead of IdentityExpression. aziz parents: 81 diff changeset	3473 Expression e;
87 c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	3474 switch (token.type)
83 9e6d66f647c9 - Fix: IsExpression was created instead of IdentityExpression. aziz parents: 81 diff changeset	3475 {
154 0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	3476 case T.Identifier, T.Dot, T.Typeof:
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	3477 e = parseDotListExpression();
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	3478 break;
84 ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3479 case T.This:
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3480 nT();
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3481 e = new ThisExpression();
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3482 break;
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3483 case T.Super:
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3484 nT();
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3485 e = new SuperExpression();
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3486 break;
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3487 case T.Null:
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3488 nT();
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3489 e = new NullExpression();
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3490 break;
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3491 case T.True, T.False:
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3492 nT();
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3493 e = new BoolExpression();
84 ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3494 break;
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3495 case T.Dollar:
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 DollarExpression();
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3498 break;
97 1a83e5070a84 - Added code for parsing IntNumber- and RealNumberExpressions. aziz parents: 96 diff changeset	3499 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	3500 e = new IntExpression(token.type, token.ulong_);
97 1a83e5070a84 - Added code for parsing IntNumber- and RealNumberExpressions. aziz parents: 96 diff changeset	3501 nT();
1a83e5070a84 - Added code for parsing IntNumber- and RealNumberExpressions. aziz parents: 96 diff changeset	3502 break;
1a83e5070a84 - Added code for parsing IntNumber- and RealNumberExpressions. aziz parents: 96 diff changeset	3503 case T.Float32, T.Float64, T.Float80,
1a83e5070a84 - Added code for parsing IntNumber- and RealNumberExpressions. aziz parents: 96 diff changeset	3504 T.Imaginary32, T.Imaginary64, T.Imaginary80:
399 ff1d11c27061 Renamed some Expression classes. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 398 diff changeset	3505 e = new RealExpression(token.type, token.real_);
97 1a83e5070a84 - Added code for parsing IntNumber- and RealNumberExpressions. aziz parents: 96 diff changeset	3506 nT();
84 ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3507 break;
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3508 case T.CharLiteral, T.WCharLiteral, T.DCharLiteral:
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3509 nT();
399 ff1d11c27061 Renamed some Expression classes. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 398 diff changeset	3510 e = new CharExpression();
84 ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3511 break;
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3512 case T.String:
157 fdbd47d72614 - Renamed class StringLiteralExpression to StringLiteralsExpression. aziz parents: 156 diff changeset	3513 Token*[] stringLiterals;
fdbd47d72614 - Renamed class StringLiteralExpression to StringLiteralsExpression. aziz parents: 156 diff changeset	3514 do
84 ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3515 {
157 fdbd47d72614 - Renamed class StringLiteralExpression to StringLiteralsExpression. aziz parents: 156 diff changeset	3516 stringLiterals ~= token;
84 ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3517 nT();
157 fdbd47d72614 - Renamed class StringLiteralExpression to StringLiteralsExpression. aziz parents: 156 diff changeset	3518 } while (token.type == T.String)
399 ff1d11c27061 Renamed some Expression classes. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 398 diff changeset	3519 e = new StringExpression(stringLiterals);
84 ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3520 break;
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3521 case T.LBracket:
85 d8dc3171440d - Fixed parsing CallExpression and IndexExpression. aziz parents: 84 diff changeset	3522 Expression[] values;
d8dc3171440d - Fixed parsing CallExpression and IndexExpression. aziz parents: 84 diff changeset	3523
d8dc3171440d - Fixed parsing CallExpression and IndexExpression. aziz parents: 84 diff changeset	3524 nT();
87 c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	3525 if (token.type != T.RBracket)
85 d8dc3171440d - Fixed parsing CallExpression and IndexExpression. aziz parents: 84 diff changeset	3526 {
d8dc3171440d - Fixed parsing CallExpression and IndexExpression. aziz parents: 84 diff changeset	3527 e = parseAssignExpression();
87 c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	3528 if (token.type == T.Colon)
85 d8dc3171440d - Fixed parsing CallExpression and IndexExpression. aziz parents: 84 diff changeset	3529 goto LparseAssocArray;
87 c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	3530 else if (token.type == T.Comma)
143 e760d7552f66 - Renamed parseArgumentList() to parseArguments(). aziz parents: 141 diff changeset	3531 values = [e] ~ parseArguments(T.RBracket);
87 c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	3532 else
c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	3533 require(T.RBracket);
85 d8dc3171440d - Fixed parsing CallExpression and IndexExpression. aziz parents: 84 diff changeset	3534 }
271 68987c1c59b6 - Fixed parsing empty ArrayLiteralExpression. Needed to skip T.RBracket. aziz parents: 270 diff changeset	3535 else
68987c1c59b6 - Fixed parsing empty ArrayLiteralExpression. Needed to skip T.RBracket. aziz parents: 270 diff changeset	3536 nT();
85 d8dc3171440d - Fixed parsing CallExpression and IndexExpression. aziz parents: 84 diff changeset	3537
d8dc3171440d - Fixed parsing CallExpression and IndexExpression. aziz parents: 84 diff changeset	3538 e = new ArrayLiteralExpression(values);
d8dc3171440d - Fixed parsing CallExpression and IndexExpression. aziz parents: 84 diff changeset	3539 break;
d8dc3171440d - Fixed parsing CallExpression and IndexExpression. aziz parents: 84 diff changeset	3540
d8dc3171440d - Fixed parsing CallExpression and IndexExpression. aziz parents: 84 diff changeset	3541 LparseAssocArray:
d8dc3171440d - Fixed parsing CallExpression and IndexExpression. aziz parents: 84 diff changeset	3542 Expression[] keys;
d8dc3171440d - Fixed parsing CallExpression and IndexExpression. aziz parents: 84 diff changeset	3543
d8dc3171440d - Fixed parsing CallExpression and IndexExpression. aziz parents: 84 diff changeset	3544 keys ~= e;
d8dc3171440d - Fixed parsing CallExpression and IndexExpression. aziz parents: 84 diff changeset	3545 nT(); // Skip colon.
271 68987c1c59b6 - Fixed parsing empty ArrayLiteralExpression. Needed to skip T.RBracket. aziz parents: 270 diff changeset	3546 goto LenterLoop;
68987c1c59b6 - Fixed parsing empty ArrayLiteralExpression. Needed to skip T.RBracket. aziz parents: 270 diff changeset	3547
68987c1c59b6 - Fixed parsing empty ArrayLiteralExpression. Needed to skip T.RBracket. aziz parents: 270 diff changeset	3548 while (1)
88 81cb24669ed3 - Fixed parser of AssocArrayLiteralExpression. aziz parents: 87 diff changeset	3549 {
271 68987c1c59b6 - Fixed parsing empty ArrayLiteralExpression. Needed to skip T.RBracket. aziz parents: 270 diff changeset	3550 keys ~= parseAssignExpression();
68987c1c59b6 - Fixed parsing empty ArrayLiteralExpression. Needed to skip T.RBracket. aziz parents: 270 diff changeset	3551 require(T.Colon);
68987c1c59b6 - Fixed parsing empty ArrayLiteralExpression. Needed to skip T.RBracket. aziz parents: 270 diff changeset	3552 LenterLoop:
68987c1c59b6 - Fixed parsing empty ArrayLiteralExpression. Needed to skip T.RBracket. aziz parents: 270 diff changeset	3553 values ~= parseAssignExpression();
68987c1c59b6 - Fixed parsing empty ArrayLiteralExpression. Needed to skip T.RBracket. aziz parents: 270 diff changeset	3554 if (token.type != T.Comma)
68987c1c59b6 - Fixed parsing empty ArrayLiteralExpression. Needed to skip T.RBracket. aziz parents: 270 diff changeset	3555 break;
68987c1c59b6 - Fixed parsing empty ArrayLiteralExpression. Needed to skip T.RBracket. aziz parents: 270 diff changeset	3556 nT();
88 81cb24669ed3 - Fixed parser of AssocArrayLiteralExpression. aziz parents: 87 diff changeset	3557 }
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3558 require(T.RBracket);
399 ff1d11c27061 Renamed some Expression classes. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 398 diff changeset	3559 e = new AArrayLiteralExpression(keys, values);
84 ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3560 break;
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3561 case T.LBrace:
193 2a2975b6d539 - Using parseFunctionBody() when parsing FunctionLiteralExpression. aziz parents: 192 diff changeset	3562 // DelegateLiteral := { Statements }
267 f3dfa6208ed3 - Removed parameter func from parseFunctionBody(). Creating new FunctionBody inside the method. aziz parents: 266 diff changeset	3563 auto funcBody = parseFunctionBody();
289 a99357783c6f - Fix: assign targs to member targs of TraitsExpression. aziz parents: 288 diff changeset	3564 e = new FunctionLiteralExpression(funcBody);
84 ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3565 break;
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3566 case T.Function, T.Delegate:
193 2a2975b6d539 - Using parseFunctionBody() when parsing FunctionLiteralExpression. aziz parents: 192 diff changeset	3567 // FunctionLiteral := (function\|delegate) Type? '(' ArgumentList ')' '{' Statements '}'
133 3924b1ee1302 - Added code for parsing function and delegate literal expressions. aziz parents: 132 diff changeset	3568 nT(); // Skip function\|delegate token.
3924b1ee1302 - Added code for parsing function and delegate literal expressions. aziz parents: 132 diff changeset	3569 Type returnType;
3924b1ee1302 - Added code for parsing function and delegate literal expressions. aziz parents: 132 diff changeset	3570 Parameters parameters;
3924b1ee1302 - Added code for parsing function and delegate literal expressions. aziz parents: 132 diff changeset	3571 if (token.type != T.LBrace)
3924b1ee1302 - Added code for parsing function and delegate literal expressions. aziz parents: 132 diff changeset	3572 {
3924b1ee1302 - Added code for parsing function and delegate literal expressions. aziz parents: 132 diff changeset	3573 if (token.type != T.LParen) // Optional return type
3924b1ee1302 - Added code for parsing function and delegate literal expressions. aziz parents: 132 diff changeset	3574 returnType = parseType();
143 e760d7552f66 - Renamed parseArgumentList() to parseArguments(). aziz parents: 141 diff changeset	3575 parameters = parseParameterList();
133 3924b1ee1302 - Added code for parsing function and delegate literal expressions. aziz parents: 132 diff changeset	3576 }
267 f3dfa6208ed3 - Removed parameter func from parseFunctionBody(). Creating new FunctionBody inside the method. aziz parents: 266 diff changeset	3577 auto funcBody = parseFunctionBody();
289 a99357783c6f - Fix: assign targs to member targs of TraitsExpression. aziz parents: 288 diff changeset	3578 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	3579 break;
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3580 case T.Assert:
86 0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	3581 Expression msg;
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	3582 requireNext(T.LParen);
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	3583 e = parseAssignExpression();
87 c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	3584 if (token.type == T.Comma)
86 0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	3585 {
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	3586 nT();
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	3587 msg = parseAssignExpression();
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	3588 }
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	3589 require(T.RParen);
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	3590 e = new AssertExpression(e, msg);
84 ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3591 break;
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3592 case T.Mixin:
86 0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	3593 requireNext(T.LParen);
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	3594 e = parseAssignExpression();
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	3595 require(T.RParen);
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	3596 e = new MixinExpression(e);
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.Import:
86 0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	3599 requireNext(T.LParen);
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	3600 e = parseAssignExpression();
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	3601 require(T.RParen);
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	3602 e = new ImportExpression(e);
84 ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3603 break;
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3604 case T.Typeid:
86 0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	3605 requireNext(T.LParen);
99 6b8c248f5911 - Added member type to classes CastExpression and TypeidExpression. aziz parents: 98 diff changeset	3606 auto type = parseType();
6b8c248f5911 - Added member type to classes CastExpression and TypeidExpression. aziz parents: 98 diff changeset	3607 require(T.RParen);
6b8c248f5911 - Added member type to classes CastExpression and TypeidExpression. aziz parents: 98 diff changeset	3608 e = new TypeidExpression(type);
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.Is:
100 538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	3611 requireNext(T.LParen);
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	3612
248 63a15b082c0c - Removed class SpecializationType. aziz parents: 247 diff changeset	3613 Type type, specType;
253 4279b638c63e - Changed some string types to Token. Adapted parser accordingly. aziz* parents: 252 diff changeset	3614 Token* ident; // optional Identifier
248 63a15b082c0c - Removed class SpecializationType. aziz parents: 247 diff changeset	3615 Token* opTok, specTok;
100 538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	3616
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	3617 type = parseDeclarator(ident, true);
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	3618
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	3619 switch (token.type)
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	3620 {
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	3621 case T.Colon, T.Equal:
248 63a15b082c0c - Removed class SpecializationType. aziz parents: 247 diff changeset	3622 opTok = token;
100 538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	3623 nT();
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	3624 switch (token.type)
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	3625 {
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	3626 case T.Typedef,
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	3627 T.Struct,
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	3628 T.Union,
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	3629 T.Class,
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	3630 T.Interface,
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	3631 T.Enum,
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	3632 T.Function,
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	3633 T.Delegate,
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	3634 T.Super,
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	3635 T.Return:
248 63a15b082c0c - Removed class SpecializationType. aziz parents: 247 diff changeset	3636 specTok = token;
102 6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	3637 nT();
100 538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	3638 break;
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	3639 default:
248 63a15b082c0c - Removed class SpecializationType. aziz parents: 247 diff changeset	3640 specType = parseType();
100 538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	3641 }
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	3642 default:
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	3643 }
377 906599374b69 - Added tparams member to IsExpression. aziz parents: 376 diff changeset	3644
906599374b69 - Added tparams member to IsExpression. aziz parents: 376 diff changeset	3645 TemplateParameters tparams;
906599374b69 - Added tparams member to IsExpression. aziz parents: 376 diff changeset	3646 version(D2)
906599374b69 - Added tparams member to IsExpression. aziz parents: 376 diff changeset	3647 {
906599374b69 - Added tparams member to IsExpression. aziz parents: 376 diff changeset	3648 // is ( Type Identifier : TypeSpecialization , TemplateParameterList )
906599374b69 - Added tparams member to IsExpression. aziz parents: 376 diff changeset	3649 // is ( Type Identifier == TypeSpecialization , TemplateParameterList )
906599374b69 - Added tparams member to IsExpression. aziz parents: 376 diff changeset	3650 if (ident && specType && token.type == T.Comma)
906599374b69 - Added tparams member to IsExpression. aziz parents: 376 diff changeset	3651 tparams = parseTemplateParameterList2();
906599374b69 - Added tparams member to IsExpression. aziz parents: 376 diff changeset	3652 }
102 6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	3653 require(T.RParen);
377 906599374b69 - Added tparams member to IsExpression. aziz parents: 376 diff changeset	3654 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	3655 break;
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3656 case T.LParen:
232 2a4e2c8ca094 - Renamed method isTemplateParameterList() to tokenAfterParenIs(). aziz parents: 231 diff changeset	3657 if (tokenAfterParenIs(T.LBrace))
130 0467f01ed524 - Fix: parameters can have optional identifier. aziz parents: 129 diff changeset	3658 {
232 2a4e2c8ca094 - Renamed method isTemplateParameterList() to tokenAfterParenIs(). aziz parents: 231 diff changeset	3659 auto parameters = parseParameterList();
143 e760d7552f66 - Renamed parseArgumentList() to parseArguments(). aziz parents: 141 diff changeset	3660 // ( ParameterList ) FunctionBody
267 f3dfa6208ed3 - Removed parameter func from parseFunctionBody(). Creating new FunctionBody inside the method. aziz parents: 266 diff changeset	3661 auto funcBody = parseFunctionBody();
289 a99357783c6f - Fix: assign targs to member targs of TraitsExpression. aziz parents: 288 diff changeset	3662 e = new FunctionLiteralExpression(null, parameters, funcBody);
130 0467f01ed524 - Fix: parameters can have optional identifier. aziz parents: 129 diff changeset	3663 }
0467f01ed524 - Fix: parameters can have optional identifier. aziz parents: 129 diff changeset	3664 else
0467f01ed524 - Fix: parameters can have optional identifier. aziz parents: 129 diff changeset	3665 {
131 ce636f3981cc - Removed TOK.Number. aziz parents: 130 diff changeset	3666 // ( Expression )
130 0467f01ed524 - Fix: parameters can have optional identifier. aziz parents: 129 diff changeset	3667 nT();
0467f01ed524 - Fix: parameters can have optional identifier. aziz parents: 129 diff changeset	3668 e = parseExpression();
0467f01ed524 - Fix: parameters can have optional identifier. aziz parents: 129 diff changeset	3669 require(T.RParen);
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3670 // TODO: create ParenExpression?
130 0467f01ed524 - Fix: parameters can have optional identifier. aziz parents: 129 diff changeset	3671 }
84 ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3672 break;
483 180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	3673 // IntegralType . Identifier
192 5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	3674 case T.Char, T.Wchar, T.Dchar, T.Bool,
94 0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	3675 T.Byte, T.Ubyte, T.Short, T.Ushort,
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	3676 T.Int, T.Uint, T.Long, T.Ulong,
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	3677 T.Float, T.Double, T.Real,
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	3678 T.Ifloat, T.Idouble, T.Ireal,
192 5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	3679 T.Cfloat, T.Cdouble, T.Creal, T.Void:
280 1eb54f6f392e - Made class Type abstract. aziz parents: 272 diff changeset	3680 auto type = new IntegralType(token.type);
247 11a67ec83281 - Call set() on type variable. aziz parents: 246 diff changeset	3681 nT();
11a67ec83281 - Call set() on type variable. aziz parents: 246 diff changeset	3682 set(type, begin);
11a67ec83281 - Call set() on type variable. aziz parents: 246 diff changeset	3683 require(T.Dot);
243 461e544ebb53 - Added method requireId(). aziz parents: 242 diff changeset	3684 auto ident = requireId();
86 0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	3685
94 0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	3686 e = new TypeDotIdExpression(type, ident);
98 aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3687 break;
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3688 version(D2)
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3689 {
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3690 case T.Traits:
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3691 nT();
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3692 require(T.LParen);
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3693 auto id = requireId();
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3694 TemplateArguments args;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3695 if (token.type == T.Comma)
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3696 {
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3697 args = parseTemplateArguments2();
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3698 }
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3699 else
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3700 require(T.RParen);
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3701 e = new TraitsExpression(id, args);
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3702 break;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3703 }
84 ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3704 default:
343 95f1b6e43214 - Removed TOK.Special and added an own entry for each special token. aziz parents: 342 diff changeset	3705 if (token.isSpecialToken)
95f1b6e43214 - Removed TOK.Special and added an own entry for each special token. aziz parents: 342 diff changeset	3706 {
95f1b6e43214 - Removed TOK.Special and added an own entry for each special token. aziz parents: 342 diff changeset	3707 e = new SpecialTokenExpression(token);
95f1b6e43214 - Removed TOK.Special and added an own entry for each special token. aziz parents: 342 diff changeset	3708 nT();
95f1b6e43214 - Removed TOK.Special and added an own entry for each special token. aziz parents: 342 diff changeset	3709 break;
95f1b6e43214 - Removed TOK.Special and added an own entry for each special token. aziz parents: 342 diff changeset	3710 }
95f1b6e43214 - Removed TOK.Special and added an own entry for each special token. aziz parents: 342 diff changeset	3711
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	3712 error(MID.ExpectedButFound, "Expression", token.srcText);
136 96468715ea79 - Returning EmptyExpression in parsePrimaryExpression() when no token matched. aziz parents: 135 diff changeset	3713 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	3714 if (!trying)
9c69615a4876 Added method insertEmptyTokenBefore() to Lexer. Made some fixes, too. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 409 diff changeset	3715 {
9c69615a4876 Added method insertEmptyTokenBefore() to Lexer. Made some fixes, too. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 409 diff changeset	3716 // 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	3717 begin = lx.insertEmptyTokenBefore(token);
9c69615a4876 Added method insertEmptyTokenBefore() to Lexer. Made some fixes, too. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 409 diff changeset	3718 prevToken = begin;
9c69615a4876 Added method insertEmptyTokenBefore() to Lexer. Made some fixes, too. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 409 diff changeset	3719 }
83 9e6d66f647c9 - Fix: IsExpression was created instead of IdentityExpression. aziz parents: 81 diff changeset	3720 }
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3721 set(e, begin);
83 9e6d66f647c9 - Fix: IsExpression was created instead of IdentityExpression. aziz parents: 81 diff changeset	3722 return e;
77 7e21c4df1c02 - Implemented parseMulExpression(). aziz parents: 76 diff changeset	3723 }
7e21c4df1c02 - Implemented parseMulExpression(). aziz parents: 76 diff changeset	3724
154 0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	3725 Expression parseNewExpression(/Expression e/)
81 aa1ea2548dd9 - Fixed parseExpression() method. aziz parents: 80 diff changeset	3726 {
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3727 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	3728 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	3729 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	3730
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon. aziz parents: 143 diff changeset	3731 Expression[] newArguments;
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon. aziz parents: 143 diff changeset	3732 Expression[] ctorArguments;
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon. aziz parents: 143 diff changeset	3733
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon. aziz parents: 143 diff changeset	3734 if (token.type == T.LParen)
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon. aziz parents: 143 diff changeset	3735 newArguments = parseArguments(T.RParen);
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon. aziz parents: 143 diff changeset	3736
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon. aziz parents: 143 diff changeset	3737 // NewAnonClassExpression:
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon. aziz parents: 143 diff changeset	3738 // 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	3739 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	3740 {
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon. aziz parents: 143 diff changeset	3741 nT();
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon. aziz parents: 143 diff changeset	3742 if (token.type == T.LParen)
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon. aziz parents: 143 diff changeset	3743 ctorArguments = parseArguments(T.RParen);
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon. aziz parents: 143 diff changeset	3744
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon. aziz parents: 143 diff changeset	3745 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	3746
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	3747 auto decls = parseDeclarationDefinitionsBlock();
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3748 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	3749 }
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon. aziz parents: 143 diff changeset	3750
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon. aziz parents: 143 diff changeset	3751 // NewExpression:
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon. aziz parents: 143 diff changeset	3752 // NewArguments Type [ AssignExpression ]
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon. aziz parents: 143 diff changeset	3753 // NewArguments Type ( ArgumentList )
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon. aziz parents: 143 diff changeset	3754 // NewArguments Type
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon. aziz parents: 143 diff changeset	3755 auto type = parseType();
302 d04a79e795a2 - Fix in parseNewExpression(): removed check for type id. aziz parents: 301 diff changeset	3756
d04a79e795a2 - Fix in parseNewExpression(): removed check for type id. aziz parents: 301 diff changeset	3757 if (token.type == T.LParen)
144 cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon. aziz parents: 143 diff changeset	3758 ctorArguments = parseArguments(T.RParen);
302 d04a79e795a2 - Fix in parseNewExpression(): removed check for type id. aziz parents: 301 diff changeset	3759
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3760 return set(new NewExpression(/e, /newArguments, type, ctorArguments), begin);
81 aa1ea2548dd9 - Fixed parseExpression() method. aziz parents: 80 diff changeset	3761 }
aa1ea2548dd9 - Fixed parseExpression() method. aziz parents: 80 diff changeset	3762
98 aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3763 Type parseType()
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3764 {
104 b535016f8c3f - DeclaratorSuffix must be parsed after an Identifier. aziz parents: 103 diff changeset	3765 return parseBasicType2(parseBasicType());
98 aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3766 }
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3767
94 0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	3768 Type parseBasicType()
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	3769 {
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3770 auto begin = token;
94 0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	3771 Type t;
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	3772 // IdentifierType tident;
94 0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	3773
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	3774 switch (token.type)
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	3775 {
192 5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	3776 case T.Char, T.Wchar, T.Dchar, T.Bool,
94 0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	3777 T.Byte, T.Ubyte, T.Short, T.Ushort,
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	3778 T.Int, T.Uint, T.Long, T.Ulong,
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	3779 T.Float, T.Double, T.Real,
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	3780 T.Ifloat, T.Idouble, T.Ireal,
192 5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	3781 T.Cfloat, T.Cdouble, T.Creal, T.Void:
280 1eb54f6f392e - Made class Type abstract. aziz parents: 272 diff changeset	3782 t = new IntegralType(token.type);
94 0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	3783 nT();
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3784 set(t, begin);
94 0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	3785 break;
153 66790fc2c0a2 - Added method parseIdentifierListType(). aziz parents: 152 diff changeset	3786 case T.Identifier, T.Typeof, T.Dot:
154 0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	3787 t = parseDotListType();
484 265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	3788 assert(!isNodeSet(t));
265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	3789 set(t, begin);
153 66790fc2c0a2 - Added method parseIdentifierListType(). aziz parents: 152 diff changeset	3790 break;
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3791 version(D2)
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3792 {
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3793 case T.Const:
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3794 // const ( Type )
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3795 nT();
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3796 require(T.LParen);
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3797 t = parseType();
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3798 require(T.RParen);
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3799 t = new ConstType(t);
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3800 set(t, begin);
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3801 break;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3802 case T.Invariant:
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3803 // invariant ( Type )
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3804 nT();
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3805 require(T.LParen);
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3806 t = parseType();
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3807 require(T.RParen);
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3808 t = new InvariantType(t);
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3809 set(t, begin);
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3810 break;
369 27767e203d64 - Added override attribute to ImportParser.start(). aziz parents: 368 diff changeset	3811 } // version(D2)
94 0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	3812 default:
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	3813 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	3814 t = new UndefinedType();
259 8118da6fee44 - Moved nT() below statement where an attribute class is constructed. aziz parents: 258 diff changeset	3815 nT();
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3816 set(t, begin);
94 0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	3817 }
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	3818 return t;
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	3819 }
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	3820
95 0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	3821 Type parseBasicType2(Type t)
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	3822 {
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3823 typeof(token) begin;
95 0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	3824 while (1)
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	3825 {
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3826 begin = token;
95 0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	3827 switch (token.type)
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	3828 {
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	3829 case T.Mul:
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	3830 t = new PointerType(t);
98 aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3831 nT();
95 0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	3832 break;
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	3833 case T.LBracket:
106 441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	3834 t = parseArrayType(t);
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3835 continue;
98 aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3836 case T.Function, T.Delegate:
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3837 TOK tok = token.type;
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3838 nT();
143 e760d7552f66 - Renamed parseArgumentList() to parseArguments(). aziz parents: 141 diff changeset	3839 auto parameters = parseParameterList();
135 145e0d68ec95 - Added enum TID to module Type. aziz parents: 134 diff changeset	3840 if (tok == T.Function)
291 c0e857931ff6 - Changed FunctionType and DelegateType. Both receive return type and parameters. aziz parents: 290 diff changeset	3841 t = new FunctionType(t, parameters);
135 145e0d68ec95 - Added enum TID to module Type. aziz parents: 134 diff changeset	3842 else
291 c0e857931ff6 - Changed FunctionType and DelegateType. Both receive return type and parameters. aziz parents: 290 diff changeset	3843 t = new DelegateType(t, parameters);
98 aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3844 break;
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3845 default:
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3846 return t;
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3847 }
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3848 set(t, begin);
98 aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3849 }
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3850 assert(0);
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3851 }
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3852
232 2a4e2c8ca094 - Renamed method isTemplateParameterList() to tokenAfterParenIs(). aziz parents: 231 diff changeset	3853 bool tokenAfterParenIs(TOK tok)
196 ea3f66901fa4 - Added code for parsing template parameter lists for functions. aziz parents: 195 diff changeset	3854 {
ea3f66901fa4 - Added code for parsing template parameter lists for functions. aziz parents: 195 diff changeset	3855 // 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	3856 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	3857 Token* next = token;
196 ea3f66901fa4 - Added code for parsing template parameter lists for functions. aziz parents: 195 diff changeset	3858 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	3859 Loop:
196 ea3f66901fa4 - Added code for parsing template parameter lists for functions. aziz parents: 195 diff changeset	3860 while (1)
ea3f66901fa4 - Added code for parsing template parameter lists for functions. aziz parents: 195 diff changeset	3861 {
232 2a4e2c8ca094 - Renamed method isTemplateParameterList() to tokenAfterParenIs(). aziz parents: 231 diff changeset	3862 lx.peek(next);
2a4e2c8ca094 - Renamed method isTemplateParameterList() to tokenAfterParenIs(). aziz parents: 231 diff changeset	3863 switch (next.type)
196 ea3f66901fa4 - Added code for parsing template parameter lists for functions. aziz parents: 195 diff changeset	3864 {
ea3f66901fa4 - Added code for parsing template parameter lists for functions. aziz parents: 195 diff changeset	3865 case T.RParen:
ea3f66901fa4 - Added code for parsing template parameter lists for functions. aziz parents: 195 diff changeset	3866 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	3867 { // 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	3868 do
cac9c8d637ad Fix: members related to error info weren't updated correctly. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 429 diff changeset	3869 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	3870 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	3871 break Loop;
196 ea3f66901fa4 - Added code for parsing template parameter lists for functions. aziz parents: 195 diff changeset	3872 }
434 cac9c8d637ad Fix: members related to error info weren't updated correctly. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 429 diff changeset	3873 break;
196 ea3f66901fa4 - Added code for parsing template parameter lists for functions. aziz parents: 195 diff changeset	3874 case T.LParen:
ea3f66901fa4 - Added code for parsing template parameter lists for functions. aziz parents: 195 diff changeset	3875 ++level;
434 cac9c8d637ad Fix: members related to error info weren't updated correctly. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 429 diff changeset	3876 break;
196 ea3f66901fa4 - Added code for parsing template parameter lists for functions. aziz parents: 195 diff changeset	3877 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	3878 break Loop;
196 ea3f66901fa4 - Added code for parsing template parameter lists for functions. aziz parents: 195 diff changeset	3879 default:
ea3f66901fa4 - Added code for parsing template parameter lists for functions. aziz parents: 195 diff changeset	3880 }
ea3f66901fa4 - Added code for parsing template parameter lists for functions. aziz parents: 195 diff changeset	3881 }
232 2a4e2c8ca094 - Renamed method isTemplateParameterList() to tokenAfterParenIs(). aziz parents: 231 diff changeset	3882 return next.type == tok;
196 ea3f66901fa4 - Added code for parsing template parameter lists for functions. aziz parents: 195 diff changeset	3883 }
ea3f66901fa4 - Added code for parsing template parameter lists for functions. aziz parents: 195 diff changeset	3884
98 aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3885 Type parseDeclaratorSuffix(Type t)
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3886 {
192 5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	3887 switch (token.type)
98 aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3888 {
192 5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	3889 case T.LBracket:
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	3890 // Type Identifier ArrayType
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	3891 // ArrayType := [] or [Type] or [Expression..Expression]
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	3892 do
106 441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	3893 t = parseArrayType(t);
192 5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	3894 while (token.type == T.LBracket)
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	3895 break;
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	3896 /+ // parsed in parseDeclaration()
192 5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	3897 case T.LParen:
258 112a57f433f2 - Created class TemplateParameters. aziz parents: 257 diff changeset	3898 TemplateParameters tparams;
232 2a4e2c8ca094 - Renamed method isTemplateParameterList() to tokenAfterParenIs(). aziz parents: 231 diff changeset	3899 if (tokenAfterParenIs(T.LParen))
196 ea3f66901fa4 - Added code for parsing template parameter lists for functions. aziz parents: 195 diff changeset	3900 {
ea3f66901fa4 - Added code for parsing template parameter lists for functions. aziz parents: 195 diff changeset	3901 // ( TemplateParameterList ) ( ParameterList )
ea3f66901fa4 - Added code for parsing template parameter lists for functions. aziz parents: 195 diff changeset	3902 tparams = parseTemplateParameterList();
ea3f66901fa4 - Added code for parsing template parameter lists for functions. aziz parents: 195 diff changeset	3903 }
ea3f66901fa4 - Added code for parsing template parameter lists for functions. aziz parents: 195 diff changeset	3904
192 5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	3905 auto params = parseParameterList();
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	3906 // ReturnType FunctionName ( ParameterList )
196 ea3f66901fa4 - Added code for parsing template parameter lists for functions. aziz parents: 195 diff changeset	3907 t = new FunctionType(t, params, tparams);
192 5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	3908 break;
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	3909 +/
192 5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	3910 default:
98 aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3911 break;
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3912 }
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3913 return t;
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3914 }
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3915
106 441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	3916 Type parseArrayType(Type t)
441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	3917 {
441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	3918 assert(token.type == T.LBracket);
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3919 auto begin = token;
106 441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	3920 nT();
441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	3921 if (token.type == T.RBracket)
441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	3922 {
441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	3923 t = new ArrayType(t);
441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	3924 nT();
441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	3925 }
441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	3926 else
441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	3927 {
214 45fc474c1678 - Changed 'failed' parameter of try_() to 'success'. aziz parents: 213 diff changeset	3928 bool success;
369 27767e203d64 - Added override attribute to ImportParser.start(). aziz parents: 368 diff changeset	3929 Type parseAAType()
27767e203d64 - Added override attribute to ImportParser.start(). aziz parents: 368 diff changeset	3930 {
27767e203d64 - Added override attribute to ImportParser.start(). aziz parents: 368 diff changeset	3931 auto type = parseType();
27767e203d64 - Added override attribute to ImportParser.start(). aziz parents: 368 diff changeset	3932 require(T.RBracket);
27767e203d64 - Added override attribute to ImportParser.start(). aziz parents: 368 diff changeset	3933 return type;
27767e203d64 - Added override attribute to ImportParser.start(). aziz parents: 368 diff changeset	3934 }
423 6057113f9a44 Refactored Parser.try_(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 422 diff changeset	3935 auto assocType = try_(&parseAAType, success);
214 45fc474c1678 - Changed 'failed' parameter of try_() to 'success'. aziz parents: 213 diff changeset	3936 if (success)
106 441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	3937 t = new ArrayType(t, assocType);
441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	3938 else
441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	3939 {
441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	3940 Expression e = parseExpression(), e2;
441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	3941 if (token.type == T.Slice)
441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	3942 {
441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	3943 nT();
441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	3944 e2 = parseExpression();
441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	3945 }
441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	3946 t = new ArrayType(t, e, e2);
369 27767e203d64 - Added override attribute to ImportParser.start(). aziz parents: 368 diff changeset	3947 require(T.RBracket);
106 441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	3948 }
441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	3949 }
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3950 set(t, begin);
106 441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	3951 return t;
441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	3952 }
441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	3953
483 180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	3954 Type parseCFunctionPointerType(Type type, ref Token* ident, bool optionalParamList)
409 38fccd2640eb Added code for parsing C function pointer declarations. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 406 diff changeset	3955 {
38fccd2640eb Added code for parsing C function pointer declarations. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 406 diff changeset	3956 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	3957 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	3958 auto begin = token;
38fccd2640eb Added code for parsing C function pointer declarations. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 406 diff changeset	3959 nT(); // Skip (
38fccd2640eb Added code for parsing C function pointer declarations. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 406 diff changeset	3960 type = parseBasicType2(type);
38fccd2640eb Added code for parsing C function pointer declarations. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 406 diff changeset	3961 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	3962 {
38fccd2640eb Added code for parsing C function pointer declarations. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 406 diff changeset	3963 // Can be nested.
483 180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	3964 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	3965 }
38fccd2640eb Added code for parsing C function pointer declarations. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 406 diff changeset	3966 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	3967 {
38fccd2640eb Added code for parsing C function pointer declarations. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 406 diff changeset	3968 // The identifier of the function pointer and the declaration.
38fccd2640eb Added code for parsing C function pointer declarations. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 406 diff changeset	3969 ident = token;
38fccd2640eb Added code for parsing C function pointer declarations. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 406 diff changeset	3970 nT();
38fccd2640eb Added code for parsing C function pointer declarations. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 406 diff changeset	3971 type = parseDeclaratorSuffix(type);
38fccd2640eb Added code for parsing C function pointer declarations. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 406 diff changeset	3972 }
38fccd2640eb Added code for parsing C function pointer declarations. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 406 diff changeset	3973 require(T.RParen);
483 180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	3974
180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	3975 Parameters params;
180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	3976 if (optionalParamList)
180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	3977 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	3978 else
180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	3979 params = parseParameterList();
180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	3980
409 38fccd2640eb Added code for parsing C function pointer declarations. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 406 diff changeset	3981 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	3982 return type;
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
253 4279b638c63e - Changed some string types to Token. Adapted parser accordingly. aziz* parents: 252 diff changeset	3985 Type parseDeclarator(ref Token* ident, bool identOptional = false)
98 aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3986 {
104 b535016f8c3f - DeclaratorSuffix must be parsed after an Identifier. aziz parents: 103 diff changeset	3987 auto t = parseType();
98 aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3988
409 38fccd2640eb Added code for parsing C function pointer declarations. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 406 diff changeset	3989 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	3990 {
483 180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	3991 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	3992 }
38fccd2640eb Added code for parsing C function pointer declarations. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 406 diff changeset	3993 else if (token.type == T.Identifier)
98 aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3994 {
253 4279b638c63e - Changed some string types to Token. Adapted parser accordingly. aziz* parents: 252 diff changeset	3995 ident = token;
95 0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	3996 nT();
104 b535016f8c3f - DeclaratorSuffix must be parsed after an Identifier. aziz parents: 103 diff changeset	3997 t = parseDeclaratorSuffix(t);
95 0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	3998 }
409 38fccd2640eb Added code for parsing C function pointer declarations. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 406 diff changeset	3999
38fccd2640eb Added code for parsing C function pointer declarations. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 406 diff changeset	4000 if (ident is null && !identOptional)
124 d4c4cea6ee7f - Renamed method errorIfNot() to expected(). aziz parents: 123 diff changeset	4001 expected(T.Identifier);
98 aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	4002
104 b535016f8c3f - DeclaratorSuffix must be parsed after an Identifier. aziz parents: 103 diff changeset	4003 return t;
95 0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	4004 }
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	4005
143 e760d7552f66 - Renamed parseArgumentList() to parseArguments(). aziz parents: 141 diff changeset	4006 Expression[] parseArguments(TOK terminator)
138 91b5187ed775 - Moved parseArgumentList() down a bit. aziz parents: 137 diff changeset	4007 {
155 cd4394ef4b59 - Added two asserts to parseArguments(). aziz parents: 154 diff changeset	4008 assert(token.type == T.LParen \|\| token.type == T.LBracket \|\| token.type == T.Comma);
cd4394ef4b59 - Added two asserts to parseArguments(). aziz parents: 154 diff changeset	4009 assert(terminator == T.RParen \|\| terminator == T.RBracket);
139 d48f345b05f8 - Implemented parseTemplateArgumentList(). aziz parents: 138 diff changeset	4010 Expression[] args;
138 91b5187ed775 - Moved parseArgumentList() down a bit. aziz parents: 137 diff changeset	4011
91b5187ed775 - Moved parseArgumentList() down a bit. aziz parents: 137 diff changeset	4012 nT();
91b5187ed775 - Moved parseArgumentList() down a bit. aziz parents: 137 diff changeset	4013 if (token.type == terminator)
91b5187ed775 - Moved parseArgumentList() down a bit. aziz parents: 137 diff changeset	4014 {
91b5187ed775 - Moved parseArgumentList() down a bit. aziz parents: 137 diff changeset	4015 nT();
91b5187ed775 - Moved parseArgumentList() down a bit. aziz parents: 137 diff changeset	4016 return null;
91b5187ed775 - Moved parseArgumentList() down a bit. aziz parents: 137 diff changeset	4017 }
91b5187ed775 - Moved parseArgumentList() down a bit. aziz parents: 137 diff changeset	4018
139 d48f345b05f8 - Implemented parseTemplateArgumentList(). aziz parents: 138 diff changeset	4019 goto LenterLoop;
d48f345b05f8 - Implemented parseTemplateArgumentList(). aziz parents: 138 diff changeset	4020 do
138 91b5187ed775 - Moved parseArgumentList() down a bit. aziz parents: 137 diff changeset	4021 {
139 d48f345b05f8 - Implemented parseTemplateArgumentList(). aziz parents: 138 diff changeset	4022 nT();
d48f345b05f8 - Implemented parseTemplateArgumentList(). aziz parents: 138 diff changeset	4023 LenterLoop:
d48f345b05f8 - Implemented parseTemplateArgumentList(). aziz parents: 138 diff changeset	4024 args ~= parseAssignExpression();
d48f345b05f8 - Implemented parseTemplateArgumentList(). aziz parents: 138 diff changeset	4025 } while (token.type == T.Comma)
d48f345b05f8 - Implemented parseTemplateArgumentList(). aziz parents: 138 diff changeset	4026
d48f345b05f8 - Implemented parseTemplateArgumentList(). aziz parents: 138 diff changeset	4027 require(terminator);
d48f345b05f8 - Implemented parseTemplateArgumentList(). aziz parents: 138 diff changeset	4028 return args;
138 91b5187ed775 - Moved parseArgumentList() down a bit. aziz parents: 137 diff changeset	4029 }
91b5187ed775 - Moved parseArgumentList() down a bit. aziz parents: 137 diff changeset	4030
143 e760d7552f66 - Renamed parseArgumentList() to parseArguments(). aziz parents: 141 diff changeset	4031 Parameters parseParameterList()
117 79857de26e86 - Moved class Parameter to module Types. Added struct Parameters. aziz parents: 116 diff changeset	4032 out(params)
96 d12d31d5fc17 - Added out-contract to parseParameters(). aziz parents: 95 diff changeset	4033 {
117 79857de26e86 - Moved class Parameter to module Types. Added struct Parameters. aziz parents: 116 diff changeset	4034 if (params.length > 1)
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters. aziz parents: 116 diff changeset	4035 foreach (param; params.items[0..$-1])
96 d12d31d5fc17 - Added out-contract to parseParameters(). aziz parents: 95 diff changeset	4036 {
117 79857de26e86 - Moved class Parameter to module Types. Added struct Parameters. aziz parents: 116 diff changeset	4037 if (param.isVariadic())
96 d12d31d5fc17 - Added out-contract to parseParameters(). aziz parents: 95 diff changeset	4038 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	4039 }
d12d31d5fc17 - Added out-contract to parseParameters(). aziz parents: 95 diff changeset	4040 }
d12d31d5fc17 - Added out-contract to parseParameters(). aziz parents: 95 diff changeset	4041 body
95 0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	4042 {
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	4043 auto begin = token;
95 0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	4044 require(T.LParen);
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	4045
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	4046 auto params = new Parameters();
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	4047
95 0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	4048 if (token.type == T.RParen)
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	4049 {
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	4050 nT();
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	4051 return set(params, begin);
95 0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	4052 }
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	4053
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	4054 while (1)
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	4055 {
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	4056 auto paramBegin = token;
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	4057 Token* stcTok;
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4058 StorageClass stc, tmp;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4059
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4060 if (token.type == T.Ellipses)
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4061 {
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4062 nT();
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4063 params ~= set(new Parameter(null, null, null, null), paramBegin);
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4064 break; // Exit loop.
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4065 }
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4066
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4067 Lstc_loop:
95 0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	4068 switch (token.type)
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	4069 {
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4070 version(D2)
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4071 {
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4072 case T.Invariant: // D2.0
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4073 if (peekNext() == T.LParen)
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4074 goto default;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4075 tmp = StorageClass.Invariant;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4076 goto Lcommon;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4077 case T.Const: // D2.0
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4078 if (peekNext() == T.LParen)
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4079 goto default;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4080 tmp = StorageClass.Const;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4081 goto Lcommon;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4082 case T.Final: // D2.0
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4083 tmp = StorageClass.Final;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4084 goto Lcommon;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4085 case T.Scope: // D2.0
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4086 tmp = StorageClass.Scope;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4087 goto Lcommon;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4088 case T.Static: // D2.0
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4089 tmp = StorageClass.Static;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4090 goto Lcommon;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4091 case T.In:
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4092 tmp = StorageClass.In;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4093 goto Lcommon;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4094 case T.Out:
282 74113a9aa77c - Fix: assigned wrong StorageClass to variable. aziz parents: 280 diff changeset	4095 tmp = StorageClass.Out;
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4096 goto Lcommon;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4097 case T.Inout, T.Ref:
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4098 tmp = StorageClass.Ref;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4099 goto Lcommon;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4100 case T.Lazy:
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4101 tmp = StorageClass.Lazy;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4102 goto Lcommon;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4103 Lcommon:
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4104 if (stc & tmp)
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4105 error(MID.RedundantStorageClass, token.srcText);
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4106 else
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4107 stc \|= tmp;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4108 nT();
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4109 goto Lstc_loop;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4110 }
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4111 else // else body of version(D2)
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4112 {
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	4113 case T.In, T.Out, T.Inout, T.Ref, T.Lazy:
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	4114 stcTok = token;
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	4115 nT();
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	4116 goto default;
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4117 }
95 0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	4118 default:
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4119 version(D2)
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4120 {
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4121 if (stc != StorageClass.None)
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4122 stcTok = begin;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4123 }
253 4279b638c63e - Changed some string types to Token. Adapted parser accordingly. aziz* parents: 252 diff changeset	4124 Token* ident;
130 0467f01ed524 - Fix: parameters can have optional identifier. aziz parents: 129 diff changeset	4125 auto type = parseDeclarator(ident, true);
99 6b8c248f5911 - Added member type to classes CastExpression and TypeidExpression. aziz parents: 98 diff changeset	4126
95 0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	4127 Expression assignExpr;
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	4128 if (token.type == T.Assign)
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	4129 {
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	4130 nT();
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	4131 assignExpr = parseAssignExpression();
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	4132 }
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	4133
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	4134 if (token.type == T.Ellipses)
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	4135 {
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	4136 auto p = set(new Parameter(stcTok, type, ident, assignExpr), paramBegin);
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	4137 p.stc \|= StorageClass.Variadic;
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	4138 params ~= p;
95 0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	4139 nT();
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	4140 break; // Exit loop.
95 0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	4141 }
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	4142
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	4143 params ~= set(new Parameter(stcTok, type, ident, assignExpr), paramBegin);
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	4144
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	4145 if (token.type != T.Comma)
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	4146 break; // Exit loop.
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	4147 nT();
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	4148 continue;
95 0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	4149 }
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	4150 break; // Exit loop.
95 0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	4151 }
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	4152 require(T.RParen);
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	4153 return set(params, begin);
95 0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	4154 }
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	4155
150 753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	4156 TemplateArguments parseTemplateArguments()
139 d48f345b05f8 - Implemented parseTemplateArgumentList(). aziz parents: 138 diff changeset	4157 {
376 5ebe80ce84f2 - Separated common code to parseTemplateArguments_(). aziz parents: 375 diff changeset	4158 TemplateArguments targs;
139 d48f345b05f8 - Implemented parseTemplateArgumentList(). aziz parents: 138 diff changeset	4159 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	4160 if (token.type != T.RParen)
376 5ebe80ce84f2 - Separated common code to parseTemplateArguments_(). aziz parents: 375 diff changeset	4161 targs = parseTemplateArguments_();
139 d48f345b05f8 - Implemented parseTemplateArgumentList(). aziz parents: 138 diff changeset	4162 require(T.RParen);
376 5ebe80ce84f2 - Separated common code to parseTemplateArguments_(). aziz parents: 375 diff changeset	4163 return targs;
139 d48f345b05f8 - Implemented parseTemplateArgumentList(). aziz parents: 138 diff changeset	4164 }
376 5ebe80ce84f2 - Separated common code to parseTemplateArguments_(). aziz parents: 375 diff changeset	4165
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4166 version(D2)
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4167 {
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4168 TemplateArguments parseTemplateArguments2()
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4169 {
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4170 assert(token.type == T.Comma);
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4171 nT();
376 5ebe80ce84f2 - Separated common code to parseTemplateArguments_(). aziz parents: 375 diff changeset	4172 TemplateArguments targs;
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4173 if (token.type != T.RParen)
376 5ebe80ce84f2 - Separated common code to parseTemplateArguments_(). aziz parents: 375 diff changeset	4174 targs = parseTemplateArguments_();
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4175 else
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4176 error(MID.ExpectedButFound, "Type/Expression", ")");
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4177 require(T.RParen);
376 5ebe80ce84f2 - Separated common code to parseTemplateArguments_(). aziz parents: 375 diff changeset	4178 return targs;
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4179 }
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	4180 } // version(D2)
376 5ebe80ce84f2 - Separated common code to parseTemplateArguments_(). aziz parents: 375 diff changeset	4181
5ebe80ce84f2 - Separated common code to parseTemplateArguments_(). aziz parents: 375 diff changeset	4182 TemplateArguments parseTemplateArguments_()
5ebe80ce84f2 - Separated common code to parseTemplateArguments_(). aziz parents: 375 diff changeset	4183 {
5ebe80ce84f2 - Separated common code to parseTemplateArguments_(). aziz parents: 375 diff changeset	4184 auto begin = token;
5ebe80ce84f2 - Separated common code to parseTemplateArguments_(). aziz parents: 375 diff changeset	4185 auto targs = new TemplateArguments;
5ebe80ce84f2 - Separated common code to parseTemplateArguments_(). aziz parents: 375 diff changeset	4186 while (1)
5ebe80ce84f2 - Separated common code to parseTemplateArguments_(). aziz parents: 375 diff changeset	4187 {
379 a92f7826a4fa - Fix in parseTemplateArguments_(): calling nested parseType_() instead of parseType() in try_(). aziz parents: 377 diff changeset	4188 Type parseType_()
a92f7826a4fa - Fix in parseTemplateArguments_(): calling nested parseType_() instead of parseType() in try_(). aziz parents: 377 diff changeset	4189 {
a92f7826a4fa - Fix in parseTemplateArguments_(): calling nested parseType_() instead of parseType() in try_(). aziz parents: 377 diff changeset	4190 auto type = parseType();
a92f7826a4fa - Fix in parseTemplateArguments_(): calling nested parseType_() instead of parseType() in try_(). aziz parents: 377 diff changeset	4191 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	4192 return type;
a92f7826a4fa - Fix in parseTemplateArguments_(): calling nested parseType_() instead of parseType() in try_(). aziz parents: 377 diff changeset	4193 ++errorCount; // Cause try_() to fail.
a92f7826a4fa - Fix in parseTemplateArguments_(): calling nested parseType_() instead of parseType() in try_(). aziz parents: 377 diff changeset	4194 return null;
a92f7826a4fa - Fix in parseTemplateArguments_(): calling nested parseType_() instead of parseType() in try_(). aziz parents: 377 diff changeset	4195 }
376 5ebe80ce84f2 - Separated common code to parseTemplateArguments_(). aziz parents: 375 diff changeset	4196 bool success;
423 6057113f9a44 Refactored Parser.try_(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 422 diff changeset	4197 auto typeArgument = try_(&parseType_, success);
376 5ebe80ce84f2 - Separated common code to parseTemplateArguments_(). aziz parents: 375 diff changeset	4198 if (success)
5ebe80ce84f2 - Separated common code to parseTemplateArguments_(). aziz parents: 375 diff changeset	4199 // TemplateArgument:
5ebe80ce84f2 - Separated common code to parseTemplateArguments_(). aziz parents: 375 diff changeset	4200 // Type
5ebe80ce84f2 - Separated common code to parseTemplateArguments_(). aziz parents: 375 diff changeset	4201 // Symbol
5ebe80ce84f2 - Separated common code to parseTemplateArguments_(). aziz parents: 375 diff changeset	4202 targs ~= typeArgument;
5ebe80ce84f2 - Separated common code to parseTemplateArguments_(). aziz parents: 375 diff changeset	4203 else
5ebe80ce84f2 - Separated common code to parseTemplateArguments_(). aziz parents: 375 diff changeset	4204 // TemplateArgument:
5ebe80ce84f2 - Separated common code to parseTemplateArguments_(). aziz parents: 375 diff changeset	4205 // AssignExpression
5ebe80ce84f2 - Separated common code to parseTemplateArguments_(). aziz parents: 375 diff changeset	4206 targs ~= parseAssignExpression();
5ebe80ce84f2 - Separated common code to parseTemplateArguments_(). aziz parents: 375 diff changeset	4207 if (token.type != T.Comma)
5ebe80ce84f2 - Separated common code to parseTemplateArguments_(). aziz parents: 375 diff changeset	4208 break; // Exit loop.
5ebe80ce84f2 - Separated common code to parseTemplateArguments_(). aziz parents: 375 diff changeset	4209 nT();
5ebe80ce84f2 - Separated common code to parseTemplateArguments_(). aziz parents: 375 diff changeset	4210 }
5ebe80ce84f2 - Separated common code to parseTemplateArguments_(). aziz parents: 375 diff changeset	4211 set(targs, begin);
5ebe80ce84f2 - Separated common code to parseTemplateArguments_(). aziz parents: 375 diff changeset	4212 return targs;
5ebe80ce84f2 - Separated common code to parseTemplateArguments_(). aziz parents: 375 diff changeset	4213 }
5ebe80ce84f2 - Separated common code to parseTemplateArguments_(). aziz parents: 375 diff changeset	4214
258 112a57f433f2 - Created class TemplateParameters. aziz parents: 257 diff changeset	4215 TemplateParameters parseTemplateParameterList()
137 b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4216 {
377 906599374b69 - Added tparams member to IsExpression. aziz parents: 376 diff changeset	4217 TemplateParameters tparams;
906599374b69 - Added tparams member to IsExpression. aziz parents: 376 diff changeset	4218 require(T.LParen);
906599374b69 - Added tparams member to IsExpression. aziz parents: 376 diff changeset	4219 if (token.type != T.RParen)
906599374b69 - Added tparams member to IsExpression. aziz parents: 376 diff changeset	4220 tparams = parseTemplateParameterList_();
906599374b69 - Added tparams member to IsExpression. aziz parents: 376 diff changeset	4221 require(T.RParen);
906599374b69 - Added tparams member to IsExpression. aziz parents: 376 diff changeset	4222 return tparams;
906599374b69 - Added tparams member to IsExpression. aziz parents: 376 diff changeset	4223 }
906599374b69 - Added tparams member to IsExpression. aziz parents: 376 diff changeset	4224
906599374b69 - Added tparams member to IsExpression. aziz parents: 376 diff changeset	4225 version(D2)
906599374b69 - Added tparams member to IsExpression. aziz parents: 376 diff changeset	4226 {
906599374b69 - Added tparams member to IsExpression. aziz parents: 376 diff changeset	4227 TemplateParameters parseTemplateParameterList2()
906599374b69 - Added tparams member to IsExpression. aziz parents: 376 diff changeset	4228 {
906599374b69 - Added tparams member to IsExpression. aziz parents: 376 diff changeset	4229 assert(token.type == T.Comma);
906599374b69 - Added tparams member to IsExpression. aziz parents: 376 diff changeset	4230 nT();
906599374b69 - Added tparams member to IsExpression. aziz parents: 376 diff changeset	4231 TemplateParameters tparams;
906599374b69 - Added tparams member to IsExpression. aziz parents: 376 diff changeset	4232 if (token.type != T.RParen)
906599374b69 - Added tparams member to IsExpression. aziz parents: 376 diff changeset	4233 tparams = parseTemplateParameterList_();
906599374b69 - Added tparams member to IsExpression. aziz parents: 376 diff changeset	4234 else
906599374b69 - Added tparams member to IsExpression. aziz parents: 376 diff changeset	4235 error(MID.ExpectedButFound, "Type/Expression", ")");
906599374b69 - Added tparams member to IsExpression. aziz parents: 376 diff changeset	4236 return tparams;
906599374b69 - Added tparams member to IsExpression. aziz parents: 376 diff changeset	4237 }
906599374b69 - Added tparams member to IsExpression. aziz parents: 376 diff changeset	4238 } // version(D2)
906599374b69 - Added tparams member to IsExpression. aziz parents: 376 diff changeset	4239
906599374b69 - Added tparams member to IsExpression. aziz parents: 376 diff changeset	4240 TemplateParameters parseTemplateParameterList_()
906599374b69 - Added tparams member to IsExpression. aziz parents: 376 diff changeset	4241 {
258 112a57f433f2 - Created class TemplateParameters. aziz parents: 257 diff changeset	4242 auto begin = token;
295 75b47c71a34c - Assigning to Node.children in several constructors that inherit from Node. aziz parents: 293 diff changeset	4243 auto tparams = new TemplateParameters;
75b47c71a34c - Assigning to Node.children in several constructors that inherit from Node. aziz parents: 293 diff changeset	4244
137 b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4245 while (1)
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4246 {
258 112a57f433f2 - Created class TemplateParameters. aziz parents: 257 diff changeset	4247 auto paramBegin = token;
340 1accb3013bd2 - Changed class TemplateParameter to an abstract class. aziz parents: 335 diff changeset	4248 TemplateParameter tp;
253 4279b638c63e - Changed some string types to Token. Adapted parser accordingly. aziz* parents: 252 diff changeset	4249 Token* ident;
137 b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4250 Type specType, defType;
340 1accb3013bd2 - Changed class TemplateParameter to an abstract class. aziz parents: 335 diff changeset	4251
1accb3013bd2 - Changed class TemplateParameter to an abstract class. aziz parents: 335 diff changeset	4252 void parseSpecAndOrDefaultType()
137 b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4253 {
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4254 // : SpecializationType
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4255 if (token.type == T.Colon)
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4256 {
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4257 nT();
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4258 specType = parseType();
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4259 }
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4260 // = DefaultType
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4261 if (token.type == T.Assign)
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4262 {
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4263 nT();
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4264 defType = parseType();
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4265 }
340 1accb3013bd2 - Changed class TemplateParameter to an abstract class. aziz parents: 335 diff changeset	4266 }
1accb3013bd2 - Changed class TemplateParameter to an abstract class. aziz parents: 335 diff changeset	4267
1accb3013bd2 - Changed class TemplateParameter to an abstract class. aziz parents: 335 diff changeset	4268 switch (token.type)
1accb3013bd2 - Changed class TemplateParameter to an abstract class. aziz parents: 335 diff changeset	4269 {
1accb3013bd2 - Changed class TemplateParameter to an abstract class. aziz parents: 335 diff changeset	4270 case T.Alias:
1accb3013bd2 - Changed class TemplateParameter to an abstract class. aziz parents: 335 diff changeset	4271 // TemplateAliasParameter:
1accb3013bd2 - Changed class TemplateParameter to an abstract class. aziz parents: 335 diff changeset	4272 // alias Identifier
1accb3013bd2 - Changed class TemplateParameter to an abstract class. aziz parents: 335 diff changeset	4273 nT(); // Skip alias keyword.
1accb3013bd2 - Changed class TemplateParameter to an abstract class. aziz parents: 335 diff changeset	4274 ident = requireId();
1accb3013bd2 - Changed class TemplateParameter to an abstract class. aziz parents: 335 diff changeset	4275 parseSpecAndOrDefaultType();
1accb3013bd2 - Changed class TemplateParameter to an abstract class. aziz parents: 335 diff changeset	4276 tp = new TemplateAliasParameter(ident, specType, defType);
137 b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4277 break;
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4278 case T.Identifier:
253 4279b638c63e - Changed some string types to Token. Adapted parser accordingly. aziz* parents: 252 diff changeset	4279 ident = token;
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	4280 switch (peekNext())
137 b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4281 {
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4282 case T.Ellipses:
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4283 // TemplateTupleParameter:
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4284 // Identifier ...
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4285 nT(); // Skip Identifier.
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4286 nT(); // Skip Ellipses.
341 3ac651ea83fb - Fix: created TemplateAliasParameter instead of TemplateTypeParameter. aziz parents: 340 diff changeset	4287 if (token.type == T.Comma)
342 f13d551d7c4f - Added error messages MID.InContract and MID.OutContract. aziz parents: 341 diff changeset	4288 error(MID.TemplateTupleParameter);
340 1accb3013bd2 - Changed class TemplateParameter to an abstract class. aziz parents: 335 diff changeset	4289 tp = new TemplateTupleParameter(ident);
137 b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4290 break;
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4291 case T.Comma, T.RParen, T.Colon, T.Assign:
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4292 // TemplateTypeParameter:
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4293 // Identifier
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4294 nT(); // Skip Identifier.
340 1accb3013bd2 - Changed class TemplateParameter to an abstract class. aziz parents: 335 diff changeset	4295 parseSpecAndOrDefaultType();
341 3ac651ea83fb - Fix: created TemplateAliasParameter instead of TemplateTypeParameter. aziz parents: 340 diff changeset	4296 tp = new TemplateTypeParameter(ident, specType, defType);
137 b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4297 break;
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4298 default:
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4299 // TemplateValueParameter:
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4300 // Declarator
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4301 ident = null;
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4302 goto LTemplateValueParameter;
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4303 }
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4304 break;
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4305 default:
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4306 LTemplateValueParameter:
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4307 // TemplateValueParameter:
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4308 // Declarator
340 1accb3013bd2 - Changed class TemplateParameter to an abstract class. aziz parents: 335 diff changeset	4309 Expression specValue, defValue;
1accb3013bd2 - Changed class TemplateParameter to an abstract class. aziz parents: 335 diff changeset	4310 auto valueType = parseDeclarator(ident);
137 b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4311 // : SpecializationValue
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4312 if (token.type == T.Colon)
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4313 {
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4314 nT();
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4315 specValue = parseCondExpression();
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4316 }
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4317 // = DefaultValue
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4318 if (token.type == T.Assign)
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4319 {
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4320 nT();
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4321 defValue = parseCondExpression();
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4322 }
340 1accb3013bd2 - Changed class TemplateParameter to an abstract class. aziz parents: 335 diff changeset	4323 tp = new TemplateValueParameter(valueType, ident, specValue, defValue);
137 b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4324 }
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4325
340 1accb3013bd2 - Changed class TemplateParameter to an abstract class. aziz parents: 335 diff changeset	4326 // Push template parameter.
1accb3013bd2 - Changed class TemplateParameter to an abstract class. aziz parents: 335 diff changeset	4327 tparams ~= set(tp, paramBegin);
137 b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4328
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4329 if (token.type != T.Comma)
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4330 break;
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4331 nT();
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4332 }
258 112a57f433f2 - Created class TemplateParameters. aziz parents: 257 diff changeset	4333 set(tparams, begin);
137 b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4334 return tparams;
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4335 }
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4336
124 d4c4cea6ee7f - Renamed method errorIfNot() to expected(). aziz parents: 123 diff changeset	4337 void expected(TOK tok)
86 0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	4338 {
87 c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	4339 if (token.type != tok)
327 a48a987f7515 - Added package dil to import declarations. aziz parents: 326 diff changeset	4340 error(MID.ExpectedButFound, Token.toString(tok), token.srcText);
86 0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	4341 }
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	4342
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	4343 void require(TOK tok)
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	4344 {
87 c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	4345 if (token.type == tok)
86 0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	4346 nT();
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	4347 else
327 a48a987f7515 - Added package dil to import declarations. aziz parents: 326 diff changeset	4348 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	4349 }
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	4350
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	4351 void requireNext(TOK tok)
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	4352 {
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	4353 nT();
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	4354 require(tok);
86 0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	4355 }
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	4356
243 461e544ebb53 - Added method requireId(). aziz parents: 242 diff changeset	4357 Token* requireId()
461e544ebb53 - Added method requireId(). aziz parents: 242 diff changeset	4358 {
461e544ebb53 - Added method requireId(). aziz parents: 242 diff changeset	4359 if (token.type == T.Identifier)
461e544ebb53 - Added method requireId(). aziz parents: 242 diff changeset	4360 {
461e544ebb53 - Added method requireId(). aziz parents: 242 diff changeset	4361 auto id = token;
461e544ebb53 - Added method requireId(). aziz parents: 242 diff changeset	4362 nT();
461e544ebb53 - Added method requireId(). aziz parents: 242 diff changeset	4363 return id;
461e544ebb53 - Added method requireId(). aziz parents: 242 diff changeset	4364 }
461e544ebb53 - Added method requireId(). aziz parents: 242 diff changeset	4365 else
461e544ebb53 - Added method requireId(). aziz parents: 242 diff changeset	4366 error(MID.ExpectedButFound, "Identifier", token.srcText);
461e544ebb53 - Added method requireId(). aziz parents: 242 diff changeset	4367 return null;
461e544ebb53 - Added method requireId(). aziz parents: 242 diff changeset	4368 }
461e544ebb53 - Added method requireId(). aziz parents: 242 diff changeset	4369
391 33b566df6af4 Migrated project to Tango. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 379 diff changeset	4370 void error(MID mid, ...)
71 b3777cca323c - Added Identity and NotIdentity tokens. aziz parents: 70 diff changeset	4371 {
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	4372 if (trying)
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	4373 {
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	4374 ++errorCount;
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	4375 return;
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	4376 }
485 ea8c7459f1c4 Changed a lot of things in the Lexer. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 484 diff changeset	4377 auto location = Lexer.getLocation(this.token);
ea8c7459f1c4 Changed a lot of things in the Lexer. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 484 diff changeset	4378 auto msg = Format(_arguments, _argptr, GetMsg(mid));
ea8c7459f1c4 Changed a lot of things in the Lexer. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 484 diff changeset	4379 errors ~= new Information(InfoType.Parser, mid, location, msg);
71 b3777cca323c - Added Identity and NotIdentity tokens. aziz parents: 70 diff changeset	4380 }
65 6c21ae79fbb3 - Renamed function Token.span to Token.srcText. aziz parents: 0 diff changeset	4381 }

Mercurial > projects > dil

annotate trunk/src/dil/Parser.d @ 485:ea8c7459f1c4