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

annotate trunk/src/dil/Parser.d @ 367:dda55fae37de

- ImportGraph.execute() can parse all modules depending on the imports of the root module. - Added function findModule(). - Renamed option includes to import_paths. - Fix in ctor of ModuleDeclaration: check for pname.length before removing last separator. - Fixed scanning binary numbers. - Added member modules and method getFQN() to class Module. - Fix in parseIfStatement(): AttributeStatement mustn't have a null parameter. - Parsing import_paths in GlobalSettings.load().

author	aziz
date	Fri, 31 Aug 2007 23:07:05 +0000
parents	dcbd3bf9bf74
children	2adf808343d6

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;
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	15 import std.stdio;
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
65 6c21ae79fbb3 - Renamed function Token.span to Token.srcText. aziz parents: 0 diff changeset	19 class Parser
6c21ae79fbb3 - Renamed function Token.span to Token.srcText. aziz parents: 0 diff changeset	20 {
71 b3777cca323c - Added Identity and NotIdentity tokens. aziz parents: 70 diff changeset	21 Lexer lx;
318 a1c9d93a66e3 - Added member prevToken to Parser. aziz parents: 314 diff changeset	22 Token* token; /// Current non-whitespace token.
a1c9d93a66e3 - Added member prevToken to Parser. aziz parents: 314 diff changeset	23 Token* prevToken; /// Previous non-whitespace token.
71 b3777cca323c - Added Identity and NotIdentity tokens. aziz parents: 70 diff changeset	24
b3777cca323c - Added Identity and NotIdentity tokens. aziz parents: 70 diff changeset	25 Information[] errors;
b3777cca323c - Added Identity and NotIdentity tokens. aziz parents: 70 diff changeset	26
364 1059295c2727 - Every command module has an execute method now. aziz parents: 359 diff changeset	27 ImportDeclaration[] imports;
1059295c2727 - Every command module has an execute method now. aziz parents: 359 diff changeset	28
71 b3777cca323c - Added Identity and NotIdentity tokens. aziz parents: 70 diff changeset	29 this(char[] srcText, string fileName)
b3777cca323c - Added Identity and NotIdentity tokens. aziz parents: 70 diff changeset	30 {
b3777cca323c - Added Identity and NotIdentity tokens. aziz parents: 70 diff changeset	31 lx = new Lexer(srcText, fileName);
87 c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	32 }
c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	33
304 fc7b9a3a99d4 - Added keyword debug to some statements. Removed some as well. aziz parents: 303 diff changeset	34 debug char* prev;
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	35
206 f9f5c0949a06 - Added method start(). aziz parents: 205 diff changeset	36 void start()
f9f5c0949a06 - Added method start(). aziz parents: 205 diff changeset	37 {
304 fc7b9a3a99d4 - Added keyword debug to some statements. Removed some as well. aziz parents: 303 diff changeset	38 debug prev = lx.text.ptr;
206 f9f5c0949a06 - Added method start(). aziz parents: 205 diff changeset	39 nT();
318 a1c9d93a66e3 - Added member prevToken to Parser. aziz parents: 314 diff changeset	40 prevToken = token;
206 f9f5c0949a06 - Added method start(). aziz parents: 205 diff changeset	41 }
f9f5c0949a06 - Added method start(). aziz parents: 205 diff changeset	42
87 c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	43 void nT()
c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	44 {
318 a1c9d93a66e3 - Added member prevToken to Parser. aziz parents: 314 diff changeset	45 prevToken = token;
132 c97a3f683d13 - Skipping comments in nT(). aziz parents: 131 diff changeset	46 do
c97a3f683d13 - Skipping comments in nT(). aziz parents: 131 diff changeset	47 {
c97a3f683d13 - Skipping comments in nT(). aziz parents: 131 diff changeset	48 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	49 token = lx.token;
304 fc7b9a3a99d4 - Added keyword debug to some statements. Removed some as well. aziz parents: 303 diff changeset	50
fc7b9a3a99d4 - Added keyword debug to some statements. Removed some as well. aziz parents: 303 diff changeset	51 debug if (!trying)
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	52 {
304 fc7b9a3a99d4 - Added keyword debug to some statements. Removed some as well. aziz parents: 303 diff changeset	53 writef("\33[32m%s\33[0m", token.type);
fc7b9a3a99d4 - Added keyword debug to some statements. Removed some as well. aziz parents: 303 diff changeset	54 writef("%s", prev[0 .. token.end - prev]);
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	55 prev = token.end;
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	56 }
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	57 } while (token.isWhitespace) // Skip whitespace
71 b3777cca323c - Added Identity and NotIdentity tokens. aziz parents: 70 diff changeset	58 }
70 0d3ef6daec04 - Added Expression class stubs. aziz parents: 69 diff changeset	59
102 6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	60 void skipToOnePast(TOK tok)
6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	61 {
6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	62 for (; token.type != tok && token.type != T.EOF; nT())
6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	63 {}
6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	64 nT();
6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	65 }
105 df34ec47fb81 - Added getState() method and State struct to Lexer. aziz parents: 104 diff changeset	66
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	67 int trying;
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	68 int errorCount;
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	69
214 45fc474c1678 - Changed 'failed' parameter of try_() to 'success'. aziz parents: 213 diff changeset	70 ReturnType try_(ReturnType)(lazy ReturnType 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	71 {
303 bc1112f7933d - Added keyword debug to some statements. aziz parents: 302 diff changeset	72 debug writef("\33[31mtry_\33[0m");
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	73 ++trying;
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	74 // auto len = errors.length;
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 auto oldToken = token;
318 a1c9d93a66e3 - Added member prevToken to Parser. aziz parents: 314 diff changeset	76 auto oldPrevToken = prevToken;
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	77 auto oldCount = errorCount;
239 7911f6a92e6e - Added 'new' and 'delete' declarations to Token and uncommented next and prev members. Added HEAD to TOK. aziz parents: 238 diff changeset	78 // auto lexerState = lx.getState();
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	79 auto result = parseMethod();
105 df34ec47fb81 - Added getState() method and State struct to Lexer. aziz parents: 104 diff changeset	80 // If the length of the array changed we know an error occurred.
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	81 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	82 {
239 7911f6a92e6e - Added 'new' and 'delete' declarations to Token and uncommented next and prev members. Added HEAD to TOK. aziz parents: 238 diff changeset	83 // lexerState.restore(); // Restore state of the Lexer object.
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	84 // errors = errors[0..len]; // Remove errors that were added when parseMethod() was called.
239 7911f6a92e6e - Added 'new' and 'delete' declarations to Token and uncommented next and prev members. Added HEAD to TOK. aziz parents: 238 diff changeset	85 token = oldToken;
318 a1c9d93a66e3 - Added member prevToken to Parser. aziz parents: 314 diff changeset	86 prevToken = oldPrevToken;
239 7911f6a92e6e - Added 'new' and 'delete' declarations to Token and uncommented next and prev members. Added HEAD to TOK. aziz parents: 238 diff changeset	87 lx.token = oldToken;
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	88 errorCount = oldCount;
214 45fc474c1678 - Changed 'failed' parameter of try_() to 'success'. aziz parents: 213 diff changeset	89 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	90 }
214 45fc474c1678 - Changed 'failed' parameter of try_() to 'success'. aziz parents: 213 diff changeset	91 else
45fc474c1678 - Changed 'failed' parameter of try_() to 'success'. aziz parents: 213 diff changeset	92 success = true;
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	93 --trying;
303 bc1112f7933d - Added keyword debug to some statements. aziz parents: 302 diff changeset	94 debug writef("\33[34m%s\33[0m", 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	95 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	96 }
105 df34ec47fb81 - Added getState() method and State struct to Lexer. aziz parents: 104 diff changeset	97
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	98 Class set(Class)(Class node, Token* begin)
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	99 {
318 a1c9d93a66e3 - Added member prevToken to Parser. aziz parents: 314 diff changeset	100 node.setTokens(begin, this.prevToken);
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	101 return node;
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	102 }
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	103
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	104 TOK peekNext()
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	105 {
239 7911f6a92e6e - Added 'new' and 'delete' declarations to Token and uncommented next and prev members. Added HEAD to TOK. aziz parents: 238 diff changeset	106 Token* next = token;
296 3a2afc425ceb - Fix in peekNext(): need to skip comments. aziz parents: 295 diff changeset	107 do
3a2afc425ceb - Fix in peekNext(): need to skip comments. aziz parents: 295 diff changeset	108 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	109 while (next.isWhitespace) // Skip whitespace
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	110 return next.type;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	111 }
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	112
102 6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	113 /++++++++++++++++++++++++++++++
6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	114 + Declaration parsing methods +
6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	115 ++++++++++++++++++++++++++++++/
6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	116
305 df237b3b5f09 - Added class Declarations. aziz parents: 304 diff changeset	117 Declarations parseModule()
102 6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	118 {
305 df237b3b5f09 - Added class Declarations. aziz parents: 304 diff changeset	119 auto decls = new Declarations;
102 6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	120
6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	121 if (token.type == T.Module)
6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	122 {
262 0f22269e76ff - Changed some string types to Token. aziz* parents: 261 diff changeset	123 auto begin = token;
364 1059295c2727 - Every command module has an execute method now. aziz parents: 359 diff changeset	124 ModuleFQN moduleFQN;
102 6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	125 do
6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	126 {
6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	127 nT();
364 1059295c2727 - Every command module has an execute method now. aziz parents: 359 diff changeset	128 moduleFQN ~= requireId();
102 6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	129 } while (token.type == T.Dot)
6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	130 require(T.Semicolon);
364 1059295c2727 - Every command module has an execute method now. aziz parents: 359 diff changeset	131 decls ~= set(new ModuleDeclaration(moduleFQN), begin);
102 6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	132 }
110 2fb631daaaae - Renamed methods. aziz parents: 109 diff changeset	133 decls ~= parseDeclarationDefinitions();
102 6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	134 return decls;
6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	135 }
6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	136
305 df237b3b5f09 - Added class Declarations. aziz parents: 304 diff changeset	137 Declarations parseDeclarationDefinitions()
102 6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	138 {
305 df237b3b5f09 - Added class Declarations. aziz parents: 304 diff changeset	139 auto decls = new Declarations;
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	140 while (token.type != T.EOF)
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	141 decls ~= parseDeclarationDefinition();
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	142 return decls;
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	143 }
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	144
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	145 /*
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	146 DeclDefsBlock:
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	147 { }
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	148 { DeclDefs }
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	149 */
305 df237b3b5f09 - Added class Declarations. aziz parents: 304 diff changeset	150 Declarations parseDeclarationDefinitionsBlock()
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	151 {
305 df237b3b5f09 - Added class Declarations. aziz parents: 304 diff changeset	152 auto decls = new Declarations;
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	153 require(T.LBrace);
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	154 while (token.type != T.RBrace && token.type != T.EOF)
161 82c5cfc7d6d3 - Started implementation of parsing statements. aziz parents: 160 diff changeset	155 decls ~= parseDeclarationDefinition();
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	156 require(T.RBrace);
102 6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	157 return decls;
6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	158 }
6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	159
110 2fb631daaaae - Renamed methods. aziz parents: 109 diff changeset	160 Declaration parseDeclarationDefinition()
102 6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	161 {
262 0f22269e76ff - Changed some string types to Token. aziz* parents: 261 diff changeset	162 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	163 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	164 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	165 {
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	166 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	167 T.Pragma,
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	168 // Protection attributes
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	169 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	170 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	171 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	172 T.Protected,
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	173 T.Public:
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	174 decl = parseAttributeSpecifier();
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	175 break;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	176 // Storage classes
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	177 case T.Extern,
203 4f949a3a394b - synchronized is parsed as an Attribute in parseDeclarationDefinition() now. aziz parents: 202 diff changeset	178 T.Deprecated,
4f949a3a394b - synchronized is parsed as an Attribute in parseDeclarationDefinition() now. aziz parents: 202 diff changeset	179 T.Override,
4f949a3a394b - synchronized is parsed as an Attribute in parseDeclarationDefinition() now. aziz parents: 202 diff changeset	180 T.Abstract,
4f949a3a394b - synchronized is parsed as an Attribute in parseDeclarationDefinition() now. aziz parents: 202 diff changeset	181 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	182 //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	183 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	184 T.Const,
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	185 //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	186 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	187 T.Scope:
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	188 case_StaticAttribute:
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	189 case_InvariantAttribute: // D 2.0
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	190 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	191 break;
191 3ce110cefbc5 - Added code for parsing AliasDeclaration and TypedefDeclaration. aziz parents: 190 diff changeset	192 case T.Alias:
3ce110cefbc5 - Added code for parsing AliasDeclaration and TypedefDeclaration. aziz parents: 190 diff changeset	193 nT();
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	194 // TODO: parse StorageClasses?
226 aa38e1401217 - Fixed cases T.Alias and T.Typedef. Wrong function called. aziz parents: 225 diff changeset	195 decl = new AliasDeclaration(parseDeclaration());
191 3ce110cefbc5 - Added code for parsing AliasDeclaration and TypedefDeclaration. aziz parents: 190 diff changeset	196 break;
3ce110cefbc5 - Added code for parsing AliasDeclaration and TypedefDeclaration. aziz parents: 190 diff changeset	197 case T.Typedef:
3ce110cefbc5 - Added code for parsing AliasDeclaration and TypedefDeclaration. aziz parents: 190 diff changeset	198 nT();
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	199 // TODO: parse StorageClasses?
226 aa38e1401217 - Fixed cases T.Alias and T.Typedef. Wrong function called. aziz parents: 225 diff changeset	200 decl = new TypedefDeclaration(parseDeclaration());
191 3ce110cefbc5 - Added code for parsing AliasDeclaration and TypedefDeclaration. aziz parents: 190 diff changeset	201 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	202 case T.Static:
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	203 switch (peekNext())
125 240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	204 {
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	205 case T.Import:
119 363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	206 goto case T.Import;
125 240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	207 case T.This:
119 363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	208 decl = parseStaticConstructorDeclaration();
125 240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	209 break;
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	210 case T.Tilde:
119 363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	211 decl = parseStaticDestructorDeclaration();
125 240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	212 break;
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	213 case T.If:
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	214 decl = parseStaticIfDeclaration();
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	215 break;
127 cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration. aziz parents: 126 diff changeset	216 case T.Assert:
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration. aziz parents: 126 diff changeset	217 decl = parseStaticAssertDeclaration();
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration. aziz parents: 126 diff changeset	218 break;
125 240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	219 default:
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	220 goto case_StaticAttribute;
125 240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	221 }
228 a4c5ee9527b7 - Replaced assert(0); with break; in case T.Static. Renamed local t to next. aziz parents: 227 diff changeset	222 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	223 case T.Import:
107 722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	224 decl = parseImportDeclaration();
364 1059295c2727 - Every command module has an execute method now. aziz parents: 359 diff changeset	225 assert(decl && decl.kind == NodeKind.ImportDeclaration);
1059295c2727 - Every command module has an execute method now. aziz parents: 359 diff changeset	226 imports ~= cast(ImportDeclaration)cast(void*)decl;
109 d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	227 break;
107 722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	228 case T.Enum:
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	229 decl = parseEnumDeclaration();
109 d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	230 break;
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	231 case T.Class:
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	232 decl = parseClassDeclaration();
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	233 break;
112 004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	234 case T.Interface:
004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	235 decl = parseInterfaceDeclaration();
004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	236 break;
113 20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	237 case T.Struct, T.Union:
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	238 decl = parseAggregateDeclaration();
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	239 break;
117 79857de26e86 - Moved class Parameter to module Types. Added struct Parameters. aziz parents: 116 diff changeset	240 case T.This:
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters. aziz parents: 116 diff changeset	241 decl = parseConstructorDeclaration();
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters. aziz parents: 116 diff changeset	242 break;
118 379f33cbd521 - Added parseDestructorDeclaration() and DestructorDeclaration class. aziz parents: 117 diff changeset	243 case T.Tilde:
379f33cbd521 - Added parseDestructorDeclaration() and DestructorDeclaration class. aziz parents: 117 diff changeset	244 decl = parseDestructorDeclaration();
379f33cbd521 - Added parseDestructorDeclaration() and DestructorDeclaration class. aziz parents: 117 diff changeset	245 break;
120 e5329dac0405 - Added parseInvariantDeclaration(). aziz parents: 119 diff changeset	246 case T.Invariant:
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	247 version(D2)
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	248 {
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	249 auto next = token;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	250 lx.peek(next);
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	251 if (next.type == T.LParen)
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	252 {
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	253 lx.peek(next);
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	254 if (next.type != T.RParen)
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	255 goto case_Declaration;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	256 }
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	257 else
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	258 goto case_InvariantAttribute;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	259 }
120 e5329dac0405 - Added parseInvariantDeclaration(). aziz parents: 119 diff changeset	260 decl = parseInvariantDeclaration();
e5329dac0405 - Added parseInvariantDeclaration(). aziz parents: 119 diff changeset	261 break;
121 030933c6b5f0 - Added parseUnittestDeclaration(). aziz parents: 120 diff changeset	262 case T.Unittest:
030933c6b5f0 - Added parseUnittestDeclaration(). aziz parents: 120 diff changeset	263 decl = parseUnittestDeclaration();
030933c6b5f0 - Added parseUnittestDeclaration(). aziz parents: 120 diff changeset	264 break;
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	265 case T.Debug:
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	266 decl = parseDebugDeclaration();
140 64d7186b087c - Implemented parseTemplateParameters(). aziz parents: 139 diff changeset	267 break;
146 8180eb84e69c - Started implementation of parseAttributeSpecifier(). aziz parents: 145 diff changeset	268 case T.Version:
8180eb84e69c - Started implementation of parseAttributeSpecifier(). aziz parents: 145 diff changeset	269 decl = parseVersionDeclaration();
8180eb84e69c - Started implementation of parseAttributeSpecifier(). aziz parents: 145 diff changeset	270 break;
140 64d7186b087c - Implemented parseTemplateParameters(). aziz parents: 139 diff changeset	271 case T.Template:
64d7186b087c - Implemented parseTemplateParameters(). aziz parents: 139 diff changeset	272 decl = parseTemplateDeclaration();
64d7186b087c - Implemented parseTemplateParameters(). aziz parents: 139 diff changeset	273 break;
141 7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration(). aziz parents: 140 diff changeset	274 case T.New:
7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration(). aziz parents: 140 diff changeset	275 decl = parseNewDeclaration();
7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration(). aziz parents: 140 diff changeset	276 break;
7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration(). aziz parents: 140 diff changeset	277 case T.Delete:
7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration(). aziz parents: 140 diff changeset	278 decl = parseDeleteDeclaration();
7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration(). aziz parents: 140 diff changeset	279 break;
146 8180eb84e69c - Started implementation of parseAttributeSpecifier(). aziz parents: 145 diff changeset	280 case T.Mixin:
256 8f27920ae17a - Made parseMixinDeclaration() a template. aziz parents: 255 diff changeset	281 decl = parseMixin!(MixinDeclaration)();
146 8180eb84e69c - Started implementation of parseAttributeSpecifier(). aziz parents: 145 diff changeset	282 break;
129 a9244d409652 - Added class EmptyDeclaration. aziz parents: 128 diff changeset	283 case T.Semicolon:
a9244d409652 - Added class EmptyDeclaration. aziz parents: 128 diff changeset	284 nT();
a9244d409652 - Added class EmptyDeclaration. aziz parents: 128 diff changeset	285 decl = new EmptyDeclaration();
a9244d409652 - Added class EmptyDeclaration. aziz parents: 128 diff changeset	286 break;
192 5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	287 // Declaration
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	288 case T.Identifier, T.Dot, T.Typeof:
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	289 // BasicType
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	290 case T.Char, T.Wchar, T.Dchar, T.Bool,
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	291 T.Byte, T.Ubyte, T.Short, T.Ushort,
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	292 T.Int, T.Uint, T.Long, T.Ulong,
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	293 T.Float, T.Double, T.Real,
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	294 T.Ifloat, T.Idouble, T.Ireal,
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	295 T.Cfloat, T.Cdouble, T.Creal, T.Void:
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	296 case_Declaration:
192 5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	297 decl = parseDeclaration();
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	298 break;
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	299 /+case T.Module:
150 753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	300 // 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	301 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	302 default:
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	303 error(MID.ExpectedButFound, "Declaration", token.srcText);
292 076152e945e0 - Added member Node[] children to class Node. aziz parents: 291 diff changeset	304 decl = new IllegalDeclaration(token);
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	305 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	306 }
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	307 // writef("§%s§", decl.classinfo.name);
262 0f22269e76ff - Changed some string types to Token. aziz* parents: 261 diff changeset	308 set(decl, begin);
129 a9244d409652 - Added class EmptyDeclaration. aziz parents: 128 diff changeset	309 return decl;
102 6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	310 }
6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	311
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	312 /*
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	313 DeclarationsBlock:
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	314 : DeclDefs
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	315 { }
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	316 { DeclDefs }
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	317 DeclDef
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	318 */
305 df237b3b5f09 - Added class Declarations. aziz parents: 304 diff changeset	319 Declaration parseDeclarationsBlock()
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	320 {
305 df237b3b5f09 - Added class Declarations. aziz parents: 304 diff changeset	321 Declaration d;
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	322 switch (token.type)
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	323 {
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	324 case T.LBrace:
305 df237b3b5f09 - Added class Declarations. aziz parents: 304 diff changeset	325 d = parseDeclarationDefinitionsBlock();
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	326 break;
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	327 case T.Colon:
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	328 nT();
305 df237b3b5f09 - Added class Declarations. aziz parents: 304 diff changeset	329 auto decls = new Declarations;
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	330 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	331 decls ~= parseDeclarationDefinition();
305 df237b3b5f09 - Added class Declarations. aziz parents: 304 diff changeset	332 d = decls;
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	333 break;
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	334 default:
305 df237b3b5f09 - Added class Declarations. aziz parents: 304 diff changeset	335 d = parseDeclarationDefinition();
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	336 }
305 df237b3b5f09 - Added class Declarations. aziz parents: 304 diff changeset	337 return d;
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	338 }
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	339
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	340 Declaration parseDeclaration(StorageClass stc = StorageClass.None)
192 5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	341 {
202 8aecf8925c5f - Added code for parsing AutoDeclaration in parseDeclaration(). aziz parents: 201 diff changeset	342 Type type;
262 0f22269e76ff - Changed some string types to Token. aziz* parents: 261 diff changeset	343 Token* ident;
192 5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	344
202 8aecf8925c5f - Added code for parsing AutoDeclaration in parseDeclaration(). aziz parents: 201 diff changeset	345 // Check for AutoDeclaration
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	346 if (stc != StorageClass.None &&
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	347 token.type == T.Identifier &&
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	348 peekNext() == T.Assign)
192 5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	349 {
262 0f22269e76ff - Changed some string types to Token. aziz* parents: 261 diff changeset	350 ident = token;
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	351 nT();
202 8aecf8925c5f - Added code for parsing AutoDeclaration in parseDeclaration(). aziz parents: 201 diff changeset	352 }
8aecf8925c5f - Added code for parsing AutoDeclaration in parseDeclaration(). aziz parents: 201 diff changeset	353 else
8aecf8925c5f - Added code for parsing AutoDeclaration in parseDeclaration(). aziz parents: 201 diff changeset	354 {
8aecf8925c5f - Added code for parsing AutoDeclaration in parseDeclaration(). aziz parents: 201 diff changeset	355 type = parseType();
262 0f22269e76ff - Changed some string types to Token. aziz* parents: 261 diff changeset	356 ident = requireId();
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	357 // Type FunctionName ( ParameterList ) FunctionBody
202 8aecf8925c5f - Added code for parsing AutoDeclaration in parseDeclaration(). aziz parents: 201 diff changeset	358 if (token.type == T.LParen)
8aecf8925c5f - Added code for parsing AutoDeclaration in parseDeclaration(). aziz parents: 201 diff changeset	359 {
8aecf8925c5f - Added code for parsing AutoDeclaration in parseDeclaration(). aziz parents: 201 diff changeset	360 // It's a function declaration
258 112a57f433f2 - Created class TemplateParameters. aziz parents: 257 diff changeset	361 TemplateParameters tparams;
232 2a4e2c8ca094 - Renamed method isTemplateParameterList() to tokenAfterParenIs(). aziz parents: 231 diff changeset	362 if (tokenAfterParenIs(T.LParen))
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	363 {
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	364 // ( TemplateParameterList ) ( ParameterList )
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	365 tparams = parseTemplateParameterList();
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	366 }
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	367
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	368 auto params = parseParameterList();
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	369 // ReturnType FunctionName ( ParameterList )
267 f3dfa6208ed3 - Removed parameter func from parseFunctionBody(). Creating new FunctionBody inside the method. aziz parents: 266 diff changeset	370 auto funcBody = parseFunctionBody();
290 7933a0c17c9f - Changed class FunctionDeclaration. Parses passes return type, function name, template parameters, normal parameters and function body to constructor. aziz parents: 289 diff changeset	371 return new FunctionDeclaration(type, ident, tparams, params, funcBody);
202 8aecf8925c5f - Added code for parsing AutoDeclaration in parseDeclaration(). aziz parents: 201 diff changeset	372 }
230 8f1790d16753 - Fix: added missing call to parseDeclaratorSuffx() in parseDeclaration. aziz parents: 229 diff changeset	373 type = parseDeclaratorSuffix(type);
192 5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	374 }
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	375
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	376 // It's a variable declaration.
262 0f22269e76ff - Changed some string types to Token. aziz* parents: 261 diff changeset	377 Token*[] idents = [ident];
194 b3604b237292 - Implemented parsing variable declarations. aziz parents: 193 diff changeset	378 Expression[] values;
199 a95fee6e4b7e - Fix: parseDeclaration(): appending null to values when no initializer present. aziz parents: 198 diff changeset	379 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	380 while (token.type == T.Comma)
b3604b237292 - Implemented parsing variable declarations. aziz parents: 193 diff changeset	381 {
222 4f31e4671e06 - Fix: nT() wasn't called in while loop to skip T.Comma. aziz parents: 220 diff changeset	382 nT();
262 0f22269e76ff - Changed some string types to Token. aziz* parents: 261 diff changeset	383 idents ~= requireId();
194 b3604b237292 - Implemented parsing variable declarations. aziz parents: 193 diff changeset	384 LenterLoop:
b3604b237292 - Implemented parsing variable declarations. aziz parents: 193 diff changeset	385 if (token.type == T.Assign)
b3604b237292 - Implemented parsing variable declarations. aziz parents: 193 diff changeset	386 {
b3604b237292 - Implemented parsing variable declarations. aziz parents: 193 diff changeset	387 nT();
b3604b237292 - Implemented parsing variable declarations. aziz parents: 193 diff changeset	388 values ~= parseInitializer();
b3604b237292 - Implemented parsing variable declarations. aziz parents: 193 diff changeset	389 }
199 a95fee6e4b7e - Fix: parseDeclaration(): appending null to values when no initializer present. aziz parents: 198 diff changeset	390 else
a95fee6e4b7e - Fix: parseDeclaration(): appending null to values when no initializer present. aziz parents: 198 diff changeset	391 values ~= null;
194 b3604b237292 - Implemented parsing variable declarations. aziz parents: 193 diff changeset	392 }
b3604b237292 - Implemented parsing variable declarations. aziz parents: 193 diff changeset	393 require(T.Semicolon);
283 df657dd98ffa - Fix: added member type to VariableDeclaration. aziz parents: 282 diff changeset	394 return new VariableDeclaration(type, idents, values);
194 b3604b237292 - Implemented parsing variable declarations. aziz parents: 193 diff changeset	395 }
192 5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	396
194 b3604b237292 - Implemented parsing variable declarations. aziz parents: 193 diff changeset	397 Expression parseInitializer()
b3604b237292 - Implemented parsing variable declarations. aziz parents: 193 diff changeset	398 {
198 88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	399 if (token.type == T.Void)
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	400 {
266 fea4e8b6cea5 - Added begin variables and calls to set(). aziz parents: 265 diff changeset	401 auto begin = token;
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	402 auto next = peekNext();
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	403 if (next == T.Comma \|\| next == T.Semicolon)
198 88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	404 {
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	405 nT();
266 fea4e8b6cea5 - Added begin variables and calls to set(). aziz parents: 265 diff changeset	406 return set(new VoidInitializer(), begin);
198 88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	407 }
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	408 }
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	409 return parseNonVoidInitializer();
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	410 }
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	411
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	412 Expression parseNonVoidInitializer()
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	413 {
266 fea4e8b6cea5 - Added begin variables and calls to set(). aziz parents: 265 diff changeset	414 auto begin = token;
198 88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	415 Expression init;
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	416 switch (token.type)
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	417 {
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	418 case T.LBracket:
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	419 // ArrayInitializer:
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	420 // [ ]
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	421 // [ ArrayMemberInitializations ]
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	422 Expression[] keys;
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	423 Expression[] values;
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	424
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	425 nT();
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	426 while (token.type != T.RBracket)
198 88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	427 {
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	428 auto e = parseNonVoidInitializer();
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	429 if (token.type == T.Colon)
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	430 {
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	431 nT();
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	432 keys ~= e;
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	433 values ~= parseNonVoidInitializer();
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	434 }
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	435 else
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	436 {
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	437 keys ~= null;
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	438 values ~= e;
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	439 }
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	440
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	441 if (token.type != T.Comma)
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	442 break;
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	443 nT();
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	444 }
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	445 require(T.RBracket);
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	446 init = new ArrayInitializer(keys, values);
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	447 break;
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	448 case T.LBrace:
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	449 // StructInitializer:
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	450 // { }
198 88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	451 // { StructMemberInitializers }
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	452 Expression parseStructInitializer()
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	453 {
263 ebcf7941f1db - Changed some string types to Token. aziz* parents: 262 diff changeset	454 Token*[] idents;
198 88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	455 Expression[] values;
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	456
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	457 nT();
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	458 while (token.type != T.RBrace)
198 88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	459 {
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	460 if (token.type == T.Identifier)
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	461 {
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	462 // 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	463 if (peekNext() == T.Colon)
198 88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	464 {
263 ebcf7941f1db - Changed some string types to Token. aziz* parents: 262 diff changeset	465 idents ~= token;
198 88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	466 nT();
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	467 nT();
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	468 }
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	469 }
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	470 // NonVoidInitializer
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	471 values ~= parseNonVoidInitializer();
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	472
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	473 if (token.type != T.Comma)
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	474 break;
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	475 nT();
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	476 }
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	477 require(T.RBrace);
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	478 return new StructInitializer(idents, values);
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	479 }
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	480
214 45fc474c1678 - Changed 'failed' parameter of try_() to 'success'. aziz parents: 213 diff changeset	481 bool success;
45fc474c1678 - Changed 'failed' parameter of try_() to 'success'. aziz parents: 213 diff changeset	482 auto si = try_(parseStructInitializer(), success);
45fc474c1678 - Changed 'failed' parameter of try_() to 'success'. aziz parents: 213 diff changeset	483 if (success)
200 61f60112ac63 - Fix: parsing AssignExpression when parsing StructInitializer failed. aziz parents: 199 diff changeset	484 {
198 88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	485 init = si;
200 61f60112ac63 - Fix: parsing AssignExpression when parsing StructInitializer failed. aziz parents: 199 diff changeset	486 break;
61f60112ac63 - Fix: parsing AssignExpression when parsing StructInitializer failed. aziz parents: 199 diff changeset	487 }
216 984d48932bce - Added class EmptyStatement. aziz parents: 214 diff changeset	488 assert(token.type == T.LBrace);
200 61f60112ac63 - Fix: parsing AssignExpression when parsing StructInitializer failed. aziz parents: 199 diff changeset	489 //goto default;
198 88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	490 default:
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	491 init = parseAssignExpression();
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	492 }
266 fea4e8b6cea5 - Added begin variables and calls to set(). aziz parents: 265 diff changeset	493 set(init, begin);
198 88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	494 return init;
192 5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	495 }
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	496
267 f3dfa6208ed3 - Removed parameter func from parseFunctionBody(). Creating new FunctionBody inside the method. aziz parents: 266 diff changeset	497 FunctionBody parseFunctionBody()
192 5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	498 {
268 c19b68a4e3db - FunctionBody inherits from Node now. aziz parents: 267 diff changeset	499 auto begin = token;
267 f3dfa6208ed3 - Removed parameter func from parseFunctionBody(). Creating new FunctionBody inside the method. aziz parents: 266 diff changeset	500 auto func = new FunctionBody;
192 5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	501 while (1)
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	502 {
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	503 switch (token.type)
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	504 {
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	505 case T.LBrace:
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	506 func.funcBody = parseStatements();
192 5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	507 break;
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	508 case T.Semicolon:
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	509 nT();
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	510 break;
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	511 case T.In:
342 f13d551d7c4f - Added error messages MID.InContract and MID.OutContract. aziz parents: 341 diff changeset	512 if (func.inBody)
f13d551d7c4f - Added error messages MID.InContract and MID.OutContract. aziz parents: 341 diff changeset	513 error(MID.InContract);
226 aa38e1401217 - Fixed cases T.Alias and T.Typedef. Wrong function called. aziz parents: 225 diff changeset	514 nT();
192 5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	515 func.inBody = parseStatements();
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	516 continue;
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	517 case T.Out:
342 f13d551d7c4f - Added error messages MID.InContract and MID.OutContract. aziz parents: 341 diff changeset	518 if (func.outBody)
f13d551d7c4f - Added error messages MID.InContract and MID.OutContract. aziz parents: 341 diff changeset	519 error(MID.OutContract);
192 5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	520 nT();
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	521 if (token.type == T.LParen)
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	522 {
226 aa38e1401217 - Fixed cases T.Alias and T.Typedef. Wrong function called. aziz parents: 225 diff changeset	523 nT();
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	524 func.outIdent = requireId();
192 5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	525 require(T.RParen);
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	526 }
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	527 func.outBody = parseStatements();
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	528 continue;
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	529 case T.Body:
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	530 nT();
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	531 goto case T.LBrace;
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	532 default:
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	533 error(MID.ExpectedButFound, "FunctionBody", token.srcText);
192 5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	534 }
342 f13d551d7c4f - Added error messages MID.InContract and MID.OutContract. aziz parents: 341 diff changeset	535 break; // Exit loop.
192 5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	536 }
268 c19b68a4e3db - FunctionBody inherits from Node now. aziz parents: 267 diff changeset	537 set(func, begin);
299 559d5d62e0c1 - Added checks for null before adding member to Node.children. aziz parents: 298 diff changeset	538 func.finishConstruction();
193 2a2975b6d539 - Using parseFunctionBody() when parsing FunctionLiteralExpression. aziz parents: 192 diff changeset	539 return func;
192 5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	540 }
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	541
359 511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	542 Linkage parseLinkage()
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	543 {
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	544 if (token.type != T.LParen)
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	545 return null;
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	546
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	547 nT(); // Skip (
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	548 if (token.type == T.RParen)
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	549 {
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	550 error(MID.MissingLinkageType);
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	551 nT();
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	552 return null;
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	553 }
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	554
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	555 auto begin = token;
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	556 auto ident = requireId();
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	557
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	558 Linkage.Type linktype;
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	559 switch (ident ? ident.identifier : null)
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	560 {
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	561 case "C":
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	562 if (token.type == T.PlusPlus)
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	563 {
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	564 nT();
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	565 linktype = Linkage.Type.Cpp;
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	566 break;
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	567 }
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	568 linktype = Linkage.Type.C;
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	569 break;
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	570 case "D":
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	571 linktype = Linkage.Type.D;
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	572 break;
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	573 case "Windows":
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	574 linktype = Linkage.Type.Windows;
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	575 break;
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	576 case "Pascal":
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	577 linktype = Linkage.Type.Pascal;
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	578 break;
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	579 case "System":
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	580 linktype = Linkage.Type.System;
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	581 break;
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	582 default:
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	583 error(MID.UnrecognizedLinkageType, token.srcText);
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	584 nT();
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	585 }
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	586 auto linkage = new Linkage(linktype);
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	587 set(linkage, begin);
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	588 require(T.RParen);
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	589 return linkage;
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	590 }
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	591
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	592 Declaration parseStorageAttribute()
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	593 {
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	594 StorageClass stc, tmp;
359 511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	595 Linkage.Category link_cat;
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	596
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	597 void addStorageClass()
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	598 {
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	599 if (stc & tmp)
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	600 error(MID.RedundantStorageClass, token.srcText);
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	601 else
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	602 stc \|= tmp;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	603 }
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	604
305 df237b3b5f09 - Added class Declarations. aziz parents: 304 diff changeset	605 Declaration parse()
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	606 {
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	607 Declaration decl;
359 511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	608 auto begin = token;
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	609 switch (token.type)
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	610 {
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	611 case T.Extern:
359 511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	612 stc \|= StorageClass.Extern;
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	613 nT();
359 511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	614 Linkage linkage = parseLinkage();
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	615
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	616 // Check for redundancy.
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	617 Linkage.Category link_cat_tmp = Linkage.getCategory(linkage);
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	618 if (link_cat & link_cat_tmp)
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	619 {
359 511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	620 char[] srcText = begin.srcText;
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	621 if (link_cat_tmp == Linkage.Category.MangleSymbol)
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	622 srcText = begin.start[0 .. prevToken.end - begin.start];
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	623 error(MID.RedundantStorageClass, srcText);
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	624 }
359 511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	625 else
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	626 link_cat \|= link_cat_tmp;
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	627
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	628 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	629 break;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	630 case T.Override:
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	631 tmp = StorageClass.Override;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	632 goto Lcommon;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	633 case T.Deprecated:
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	634 tmp = StorageClass.Deprecated;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	635 goto Lcommon;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	636 case T.Abstract:
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	637 tmp = StorageClass.Abstract;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	638 goto Lcommon;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	639 case T.Synchronized:
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	640 tmp = StorageClass.Synchronized;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	641 goto Lcommon;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	642 case T.Static:
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	643 tmp = StorageClass.Static;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	644 goto Lcommon;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	645 case T.Final:
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	646 tmp = StorageClass.Final;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	647 goto Lcommon;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	648 case T.Const:
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	649 version(D2)
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	650 {
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	651 if (peekNext() == T.LParen)
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	652 goto case_Declaration;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	653 }
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	654 tmp = StorageClass.Const;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	655 goto Lcommon;
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	656 version(D2)
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	657 {
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	658 case T.Invariant: // D 2.0
359 511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	659 // TODO: could this be a class invariant?
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	660 if (peekNext() == T.LParen)
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	661 goto case_Declaration;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	662 tmp = StorageClass.Invariant;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	663 goto Lcommon;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	664 }
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	665 case T.Auto:
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	666 tmp = StorageClass.Auto;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	667 goto Lcommon;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	668 case T.Scope:
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	669 tmp = StorageClass.Scope;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	670 goto Lcommon;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	671 Lcommon:
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	672 addStorageClass();
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	673 auto tok = token.type;
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	674 nT();
359 511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	675 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	676 break;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	677 case T.Identifier:
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	678 case_Declaration:
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	679 // 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	680 decl = parseDeclaration(stc);
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	681 break;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	682 default:
305 df237b3b5f09 - Added class Declarations. aziz parents: 304 diff changeset	683 decl = parseDeclarationsBlock();
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	684 }
305 df237b3b5f09 - Added class Declarations. aziz parents: 304 diff changeset	685 return decl;
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	686 }
305 df237b3b5f09 - Added class Declarations. aziz parents: 304 diff changeset	687 return parse();
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	688 }
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	689
260 b83180748ae6 - Added method parseAlignAttribute(). aziz parents: 259 diff changeset	690 Token* parseAlignAttribute()
b83180748ae6 - Added method parseAlignAttribute(). aziz parents: 259 diff changeset	691 {
b83180748ae6 - Added method parseAlignAttribute(). aziz parents: 259 diff changeset	692 assert(token.type == T.Align);
b83180748ae6 - Added method parseAlignAttribute(). aziz parents: 259 diff changeset	693 nT(); // Skip align keyword.
b83180748ae6 - Added method parseAlignAttribute(). aziz parents: 259 diff changeset	694 Token* tok;
b83180748ae6 - Added method parseAlignAttribute(). aziz parents: 259 diff changeset	695 if (token.type == T.LParen)
b83180748ae6 - Added method parseAlignAttribute(). aziz parents: 259 diff changeset	696 {
b83180748ae6 - Added method parseAlignAttribute(). aziz parents: 259 diff changeset	697 nT();
b83180748ae6 - Added method parseAlignAttribute(). aziz parents: 259 diff changeset	698 if (token.type == T.Int32)
b83180748ae6 - Added method parseAlignAttribute(). aziz parents: 259 diff changeset	699 {
b83180748ae6 - Added method parseAlignAttribute(). aziz parents: 259 diff changeset	700 tok = token;
b83180748ae6 - Added method parseAlignAttribute(). aziz parents: 259 diff changeset	701 nT();
b83180748ae6 - Added method parseAlignAttribute(). aziz parents: 259 diff changeset	702 }
b83180748ae6 - Added method parseAlignAttribute(). aziz parents: 259 diff changeset	703 else
b83180748ae6 - Added method parseAlignAttribute(). aziz parents: 259 diff changeset	704 expected(T.Int32);
b83180748ae6 - Added method parseAlignAttribute(). aziz parents: 259 diff changeset	705 require(T.RParen);
b83180748ae6 - Added method parseAlignAttribute(). aziz parents: 259 diff changeset	706 }
b83180748ae6 - Added method parseAlignAttribute(). aziz parents: 259 diff changeset	707 return tok;
b83180748ae6 - Added method parseAlignAttribute(). aziz parents: 259 diff changeset	708 }
b83180748ae6 - Added method parseAlignAttribute(). aziz parents: 259 diff changeset	709
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	710 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	711 {
146 8180eb84e69c - Started implementation of parseAttributeSpecifier(). aziz parents: 145 diff changeset	712 Declaration decl;
8180eb84e69c - Started implementation of parseAttributeSpecifier(). aziz parents: 145 diff changeset	713
8180eb84e69c - Started implementation of parseAttributeSpecifier(). aziz parents: 145 diff changeset	714 switch (token.type)
8180eb84e69c - Started implementation of parseAttributeSpecifier(). aziz parents: 145 diff changeset	715 {
8180eb84e69c - Started implementation of parseAttributeSpecifier(). aziz parents: 145 diff changeset	716 case T.Align:
8180eb84e69c - Started implementation of parseAttributeSpecifier(). aziz parents: 145 diff changeset	717 int size = -1;
260 b83180748ae6 - Added method parseAlignAttribute(). aziz parents: 259 diff changeset	718 auto intTok = parseAlignAttribute();
b83180748ae6 - Added method parseAlignAttribute(). aziz parents: 259 diff changeset	719 if (intTok)
b83180748ae6 - Added method parseAlignAttribute(). aziz parents: 259 diff changeset	720 size = intTok.int_;
146 8180eb84e69c - Started implementation of parseAttributeSpecifier(). aziz parents: 145 diff changeset	721 decl = new AlignDeclaration(size, parseDeclarationsBlock());
8180eb84e69c - Started implementation of parseAttributeSpecifier(). aziz parents: 145 diff changeset	722 break;
8180eb84e69c - Started implementation of parseAttributeSpecifier(). aziz parents: 145 diff changeset	723 case T.Pragma:
147 e46b3415ec16 - Implemented parsing pragma declarations. aziz parents: 146 diff changeset	724 // Pragma:
e46b3415ec16 - Implemented parsing pragma declarations. aziz parents: 146 diff changeset	725 // pragma ( Identifier )
e46b3415ec16 - Implemented parsing pragma declarations. aziz parents: 146 diff changeset	726 // pragma ( Identifier , ExpressionList )
e46b3415ec16 - Implemented parsing pragma declarations. aziz parents: 146 diff changeset	727 // ExpressionList:
e46b3415ec16 - Implemented parsing pragma declarations. aziz parents: 146 diff changeset	728 // AssignExpression
e46b3415ec16 - Implemented parsing pragma declarations. aziz parents: 146 diff changeset	729 // AssignExpression , ExpressionList
e46b3415ec16 - Implemented parsing pragma declarations. aziz parents: 146 diff changeset	730 nT();
245 93d37f874658 - Changed type of pragma identifier to Token. aziz* parents: 244 diff changeset	731 Token* ident;
147 e46b3415ec16 - Implemented parsing pragma declarations. aziz parents: 146 diff changeset	732 Expression[] args;
305 df237b3b5f09 - Added class Declarations. aziz parents: 304 diff changeset	733 Declaration decls;
147 e46b3415ec16 - Implemented parsing pragma declarations. aziz parents: 146 diff changeset	734
e46b3415ec16 - Implemented parsing pragma declarations. aziz parents: 146 diff changeset	735 require(T.LParen);
245 93d37f874658 - Changed type of pragma identifier to Token. aziz* parents: 244 diff changeset	736 ident = requireId();
147 e46b3415ec16 - Implemented parsing pragma declarations. aziz parents: 146 diff changeset	737
e46b3415ec16 - Implemented parsing pragma declarations. aziz parents: 146 diff changeset	738 if (token.type == T.Comma)
244 829fdb2e2915 - Fix: parsing at least one argument in pragma declarations/statements. aziz parents: 243 diff changeset	739 {
829fdb2e2915 - Fix: parsing at least one argument in pragma declarations/statements. aziz parents: 243 diff changeset	740 // Parse at least one argument.
829fdb2e2915 - Fix: parsing at least one argument in pragma declarations/statements. aziz parents: 243 diff changeset	741 nT();
829fdb2e2915 - Fix: parsing at least one argument in pragma declarations/statements. aziz parents: 243 diff changeset	742 args ~= parseAssignExpression();
829fdb2e2915 - Fix: parsing at least one argument in pragma declarations/statements. aziz parents: 243 diff changeset	743 }
829fdb2e2915 - Fix: parsing at least one argument in pragma declarations/statements. aziz parents: 243 diff changeset	744
829fdb2e2915 - Fix: parsing at least one argument in pragma declarations/statements. aziz parents: 243 diff changeset	745 if (token.type == T.Comma)
829fdb2e2915 - Fix: parsing at least one argument in pragma declarations/statements. aziz parents: 243 diff changeset	746 args ~= parseArguments(T.RParen);
147 e46b3415ec16 - Implemented parsing pragma declarations. aziz parents: 146 diff changeset	747 else
e46b3415ec16 - Implemented parsing pragma declarations. aziz parents: 146 diff changeset	748 require(T.RParen);
e46b3415ec16 - Implemented parsing pragma declarations. aziz parents: 146 diff changeset	749
e46b3415ec16 - Implemented parsing pragma declarations. aziz parents: 146 diff changeset	750 if (token.type == T.Semicolon)
313 1c1adededd8f - Fix: assign new EmptyDeclaration to decls when parsing PragmaStatement. aziz parents: 312 diff changeset	751 {
147 e46b3415ec16 - Implemented parsing pragma declarations. aziz parents: 146 diff changeset	752 nT();
313 1c1adededd8f - Fix: assign new EmptyDeclaration to decls when parsing PragmaStatement. aziz parents: 312 diff changeset	753 decls = new EmptyDeclaration();
1c1adededd8f - Fix: assign new EmptyDeclaration to decls when parsing PragmaStatement. aziz parents: 312 diff changeset	754 }
147 e46b3415ec16 - Implemented parsing pragma declarations. aziz parents: 146 diff changeset	755 else
e46b3415ec16 - Implemented parsing pragma declarations. aziz parents: 146 diff changeset	756 decls = parseDeclarationsBlock();
e46b3415ec16 - Implemented parsing pragma declarations. aziz parents: 146 diff changeset	757
e46b3415ec16 - Implemented parsing pragma declarations. aziz parents: 146 diff changeset	758 decl = new PragmaDeclaration(ident, args, decls);
e46b3415ec16 - Implemented parsing pragma declarations. aziz parents: 146 diff changeset	759 break;
149 37e2e0d06013 - Removed ProtectionDeclaration. aziz parents: 148 diff changeset	760 // Protection attributes
146 8180eb84e69c - Started implementation of parseAttributeSpecifier(). aziz parents: 145 diff changeset	761 case T.Private:
8180eb84e69c - Started implementation of parseAttributeSpecifier(). aziz parents: 145 diff changeset	762 case T.Package:
8180eb84e69c - Started implementation of parseAttributeSpecifier(). aziz parents: 145 diff changeset	763 case T.Protected:
8180eb84e69c - Started implementation of parseAttributeSpecifier(). aziz parents: 145 diff changeset	764 case T.Public:
148 e3e4d3314166 - Implemented parsing protection attributes. aziz parents: 147 diff changeset	765 case T.Export:
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	766 auto tok = token.type;
150 753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	767 nT();
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	768 decl = new AttributeDeclaration(tok, parseDeclarationsBlock());
149 37e2e0d06013 - Removed ProtectionDeclaration. aziz parents: 148 diff changeset	769 break;
146 8180eb84e69c - Started implementation of parseAttributeSpecifier(). aziz parents: 145 diff changeset	770 default:
8180eb84e69c - Started implementation of parseAttributeSpecifier(). aziz parents: 145 diff changeset	771 assert(0);
8180eb84e69c - Started implementation of parseAttributeSpecifier(). aziz parents: 145 diff changeset	772 }
8180eb84e69c - Started implementation of parseAttributeSpecifier(). aziz parents: 145 diff changeset	773 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	774 }
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	775
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	776 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	777 {
107 722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	778 assert(token.type == T.Import \|\| token.type == T.Static);
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	779
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	780 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	781
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	782 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	783 {
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	784 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	785 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	786 }
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	787
364 1059295c2727 - Every command module has an execute method now. aziz parents: 359 diff changeset	788 ModuleFQN[] moduleFQNs;
263 ebcf7941f1db - Changed some string types to Token. aziz* parents: 262 diff changeset	789 Token*[] moduleAliases;
ebcf7941f1db - Changed some string types to Token. aziz* parents: 262 diff changeset	790 Token*[] bindNames;
ebcf7941f1db - Changed some string types to Token. aziz* parents: 262 diff changeset	791 Token*[] bindAliases;
114 83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	792
115 cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier(). aziz parents: 114 diff changeset	793 nT(); // Skip import keyword.
298 dc8bed242db5 - Fixed parsing ImportDeclaration. aziz parents: 297 diff changeset	794 while (1)
114 83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	795 {
364 1059295c2727 - Every command module has an execute method now. aziz parents: 359 diff changeset	796 ModuleFQN moduleFQN;
263 ebcf7941f1db - Changed some string types to Token. aziz* parents: 262 diff changeset	797 Token* moduleAlias;
ebcf7941f1db - Changed some string types to Token. aziz* parents: 262 diff changeset	798
ebcf7941f1db - Changed some string types to Token. aziz* parents: 262 diff changeset	799 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	800
cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier(). aziz parents: 114 diff changeset	801 // AliasName = ModuleName
cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier(). aziz parents: 114 diff changeset	802 if (token.type == T.Assign)
114 83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	803 {
83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	804 nT();
364 1059295c2727 - Every command module has an execute method now. aziz parents: 359 diff changeset	805 moduleFQN ~= requireId();
114 83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	806 }
115 cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier(). aziz parents: 114 diff changeset	807 else // import Identifier [^=]
114 83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	808 {
364 1059295c2727 - Every command module has an execute method now. aziz parents: 359 diff changeset	809 moduleFQN ~= moduleAlias;
114 83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	810 moduleAlias = null;
83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	811 }
115 cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier(). aziz parents: 114 diff changeset	812
298 dc8bed242db5 - Fixed parsing ImportDeclaration. aziz parents: 297 diff changeset	813 // Identifier(.Identifier)*
114 83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	814 while (token.type == T.Dot)
83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	815 {
83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	816 nT();
364 1059295c2727 - Every command module has an execute method now. aziz parents: 359 diff changeset	817 moduleFQN ~= requireId();
114 83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	818 }
83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	819
83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	820 // Push identifiers.
364 1059295c2727 - Every command module has an execute method now. aziz parents: 359 diff changeset	821 moduleFQNs ~= moduleFQN;
114 83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	822 moduleAliases ~= moduleAlias;
83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	823
83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	824 if (token.type == T.Colon)
298 dc8bed242db5 - Fixed parsing ImportDeclaration. aziz parents: 297 diff changeset	825 break;
dc8bed242db5 - Fixed parsing ImportDeclaration. aziz parents: 297 diff changeset	826 if (token.type != T.Comma)
dc8bed242db5 - Fixed parsing ImportDeclaration. aziz parents: 297 diff changeset	827 break;
dc8bed242db5 - Fixed parsing ImportDeclaration. aziz parents: 297 diff changeset	828 nT();
dc8bed242db5 - Fixed parsing ImportDeclaration. aziz parents: 297 diff changeset	829 }
dc8bed242db5 - Fixed parsing ImportDeclaration. aziz parents: 297 diff changeset	830
dc8bed242db5 - Fixed parsing ImportDeclaration. aziz parents: 297 diff changeset	831 if (token.type == T.Colon)
dc8bed242db5 - Fixed parsing ImportDeclaration. aziz parents: 297 diff changeset	832 {
dc8bed242db5 - Fixed parsing ImportDeclaration. aziz parents: 297 diff changeset	833 // BindAlias = BindName(, BindAlias = BindName)*;
dc8bed242db5 - Fixed parsing ImportDeclaration. aziz parents: 297 diff changeset	834 // BindName(, BindName)*;
dc8bed242db5 - Fixed parsing ImportDeclaration. aziz parents: 297 diff changeset	835 Token* bindName, bindAlias;
320 0ce14640eb04 - Fix in parseImportDeclaration(): rewrote while loop and removed a call to nT(). aziz parents: 319 diff changeset	836 do
114 83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	837 {
298 dc8bed242db5 - Fixed parsing ImportDeclaration. aziz parents: 297 diff changeset	838 nT();
dc8bed242db5 - Fixed parsing ImportDeclaration. aziz parents: 297 diff changeset	839 bindAlias = requireId();
dc8bed242db5 - Fixed parsing ImportDeclaration. aziz parents: 297 diff changeset	840
dc8bed242db5 - Fixed parsing ImportDeclaration. aziz parents: 297 diff changeset	841 if (token.type == T.Assign)
114 83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	842 {
83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	843 nT();
298 dc8bed242db5 - Fixed parsing ImportDeclaration. aziz parents: 297 diff changeset	844 bindName = requireId();
dc8bed242db5 - Fixed parsing ImportDeclaration. aziz parents: 297 diff changeset	845 }
dc8bed242db5 - Fixed parsing ImportDeclaration. aziz parents: 297 diff changeset	846 else
dc8bed242db5 - Fixed parsing ImportDeclaration. aziz parents: 297 diff changeset	847 {
dc8bed242db5 - Fixed parsing ImportDeclaration. aziz parents: 297 diff changeset	848 bindName = bindAlias;
dc8bed242db5 - Fixed parsing ImportDeclaration. aziz parents: 297 diff changeset	849 bindAlias = null;
dc8bed242db5 - Fixed parsing ImportDeclaration. aziz parents: 297 diff changeset	850 }
dc8bed242db5 - Fixed parsing ImportDeclaration. aziz parents: 297 diff changeset	851
dc8bed242db5 - Fixed parsing ImportDeclaration. aziz parents: 297 diff changeset	852 // Push identifiers.
dc8bed242db5 - Fixed parsing ImportDeclaration. aziz parents: 297 diff changeset	853 bindNames ~= bindName;
dc8bed242db5 - Fixed parsing ImportDeclaration. aziz parents: 297 diff changeset	854 bindAliases ~= bindAlias;
320 0ce14640eb04 - Fix in parseImportDeclaration(): rewrote while loop and removed a call to nT(). aziz parents: 319 diff changeset	855 } while (token.type == T.Comma)
298 dc8bed242db5 - Fixed parsing ImportDeclaration. aziz parents: 297 diff changeset	856 }
dc8bed242db5 - Fixed parsing ImportDeclaration. aziz parents: 297 diff changeset	857
114 83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	858 require(T.Semicolon);
83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	859
366 dcbd3bf9bf74 - Added command importgraph/igraph to main.d. aziz parents: 364 diff changeset	860 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	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
107 722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	863 Declaration parseEnumDeclaration()
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	864 {
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	865 assert(token.type == T.Enum);
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	866
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	867 Token* enumName;
107 722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	868 Type baseType;
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	869 Token*[] members;
107 722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	870 Expression[] values;
126 0f0e7352e91d - Renamed member hasDefinition of class Declaration to hasBody. aziz parents: 125 diff changeset	871 bool hasBody;
107 722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	872
115 cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier(). aziz parents: 114 diff changeset	873 nT(); // Skip enum keyword.
231 6846138a0e24 - Fixed parseEnumDeclaration(). aziz parents: 230 diff changeset	874
6846138a0e24 - Fixed parseEnumDeclaration(). aziz parents: 230 diff changeset	875 if (token.type == T.Identifier)
6846138a0e24 - Fixed parseEnumDeclaration(). aziz parents: 230 diff changeset	876 {
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	877 enumName = token;
231 6846138a0e24 - Fixed parseEnumDeclaration(). aziz parents: 230 diff changeset	878 nT();
6846138a0e24 - Fixed parseEnumDeclaration(). aziz parents: 230 diff changeset	879 }
107 722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	880
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	881 if (token.type == T.Colon)
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	882 {
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	883 nT();
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	884 baseType = parseBasicType();
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	885 }
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	886
115 cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier(). aziz parents: 114 diff changeset	887 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	888 {
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	889 if (enumName is null)
231 6846138a0e24 - Fixed parseEnumDeclaration(). aziz parents: 230 diff changeset	890 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	891 nT();
cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier(). aziz parents: 114 diff changeset	892 }
cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier(). aziz parents: 114 diff changeset	893 else if (token.type == T.LBrace)
107 722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	894 {
126 0f0e7352e91d - Renamed member hasDefinition of class Declaration to hasBody. aziz parents: 125 diff changeset	895 hasBody = true;
107 722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	896 nT();
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	897 do
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	898 {
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	899 members ~= requireId();
107 722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	900
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	901 if (token.type == T.Assign)
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	902 {
115 cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier(). aziz parents: 114 diff changeset	903 nT();
107 722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	904 values ~= parseAssignExpression();
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	905 }
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	906 else
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	907 values ~= null;
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	908
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	909 if (token.type == T.Comma)
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	910 nT();
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	911 else if (token.type != T.RBrace)
115 cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier(). aziz parents: 114 diff changeset	912 {
124 d4c4cea6ee7f - Renamed method errorIfNot() to expected(). aziz parents: 123 diff changeset	913 expected(T.RBrace);
115 cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier(). aziz parents: 114 diff changeset	914 break;
cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier(). aziz parents: 114 diff changeset	915 }
107 722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	916 } while (token.type != T.RBrace)
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	917 nT();
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	918 }
231 6846138a0e24 - Fixed parseEnumDeclaration(). aziz parents: 230 diff changeset	919 else
6846138a0e24 - Fixed parseEnumDeclaration(). aziz parents: 230 diff changeset	920 error(MID.ExpectedButFound, "enum declaration", token.srcText);
107 722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	921
126 0f0e7352e91d - Renamed member hasDefinition of class Declaration to hasBody. aziz parents: 125 diff changeset	922 return new EnumDeclaration(enumName, baseType, members, values, hasBody);
107 722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	923 }
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	924
109 d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	925 Declaration parseClassDeclaration()
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	926 {
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	927 assert(token.type == T.Class);
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	928
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	929 Token* className;
258 112a57f433f2 - Created class TemplateParameters. aziz parents: 257 diff changeset	930 TemplateParameters tparams;
109 d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	931 BaseClass[] bases;
305 df237b3b5f09 - Added class Declarations. aziz parents: 304 diff changeset	932 Declarations decls;
126 0f0e7352e91d - Renamed member hasDefinition of class Declaration to hasBody. aziz parents: 125 diff changeset	933 bool hasBody;
109 d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	934
115 cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier(). aziz parents: 114 diff changeset	935 nT(); // Skip class keyword.
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	936 className = requireId();
109 d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	937
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	938 if (token.type == T.LParen)
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	939 {
195 37c2ffd649c4 - Parsing template parameter list for class, interface, struct and union declarations. aziz parents: 194 diff changeset	940 tparams = parseTemplateParameterList();
109 d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	941 }
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	942
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	943 if (token.type == T.Colon)
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	944 bases = parseBaseClasses();
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	945
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	946 if (token.type == T.Semicolon)
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	947 {
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	948 //if (bases.length != 0)
195 37c2ffd649c4 - Parsing template parameter list for class, interface, struct and union declarations. aziz parents: 194 diff changeset	949 // TODO: Error: bases classes are not allowed in forward declarations.
109 d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	950 nT();
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	951 }
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	952 else if (token.type == T.LBrace)
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	953 {
126 0f0e7352e91d - Renamed member hasDefinition of class Declaration to hasBody. aziz parents: 125 diff changeset	954 hasBody = true;
115 cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier(). aziz parents: 114 diff changeset	955 // TODO: think about setting a member status variable to a flag InClassBody... this way we can check for DeclDefs that are illegal in class bodies in the parsing phase.
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	956 decls = parseDeclarationDefinitionsBlock();
109 d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	957 }
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	958 else
124 d4c4cea6ee7f - Renamed method errorIfNot() to expected(). aziz parents: 123 diff changeset	959 expected(T.LBrace); // TODO: better error msg
109 d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	960
195 37c2ffd649c4 - Parsing template parameter list for class, interface, struct and union declarations. aziz parents: 194 diff changeset	961 return new ClassDeclaration(className, tparams, bases, decls, hasBody);
109 d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	962 }
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	963
144 cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon. aziz parents: 143 diff changeset	964 BaseClass[] parseBaseClasses(bool colonLeadsOff = true)
109 d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	965 {
144 cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon. aziz parents: 143 diff changeset	966 if (colonLeadsOff)
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon. aziz parents: 143 diff changeset	967 {
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon. aziz parents: 143 diff changeset	968 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	969 nT(); // Skip colon
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon. aziz parents: 143 diff changeset	970 }
109 d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	971
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	972 BaseClass[] bases;
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	973
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	974 while (1)
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	975 {
117 79857de26e86 - Moved class Parameter to module Types. Added struct Parameters. aziz parents: 116 diff changeset	976 Protection prot = Protection.Public;
109 d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	977 switch (token.type)
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	978 {
204 082f30904456 - Allowing 'typeof' in BaseClassList. aziz parents: 203 diff changeset	979 case T.Identifier, T.Dot, T.Typeof: goto LparseBasicType;
109 d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	980 case T.Private: prot = Protection.Private; break;
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	981 case T.Protected: prot = Protection.Protected; break;
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	982 case T.Package: prot = Protection.Package; break;
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	983 case T.Public: /prot = Protection.Public;/ break;
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	984 default:
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	985 // TODO: issue error msg
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	986 return bases;
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	987 }
158 759f437313f9 - Moved enum Protection and class BaseClass to module Types. aziz parents: 157 diff changeset	988 nT(); // Skip protection attribute.
759f437313f9 - Moved enum Protection and class BaseClass to module Types. aziz parents: 157 diff changeset	989 LparseBasicType:
759f437313f9 - Moved enum Protection and class BaseClass to module Types. aziz parents: 157 diff changeset	990 auto type = parseBasicType();
759f437313f9 - Moved enum Protection and class BaseClass to module Types. aziz parents: 157 diff changeset	991 //if (type.tid != TID.DotList)
759f437313f9 - Moved enum Protection and class BaseClass to module Types. aziz parents: 157 diff changeset	992 // 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	993 bases ~= new BaseClass(prot, type);
109 d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	994 if (token.type != T.Comma)
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	995 break;
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	996 }
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	997 return bases;
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	998 }
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	999
112 004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	1000 Declaration parseInterfaceDeclaration()
004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	1001 {
004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	1002 assert(token.type == T.Interface);
004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	1003
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	1004 Token* name;
258 112a57f433f2 - Created class TemplateParameters. aziz parents: 257 diff changeset	1005 TemplateParameters tparams;
112 004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	1006 BaseClass[] bases;
305 df237b3b5f09 - Added class Declarations. aziz parents: 304 diff changeset	1007 Declarations decls;
126 0f0e7352e91d - Renamed member hasDefinition of class Declaration to hasBody. aziz parents: 125 diff changeset	1008 bool hasBody;
112 004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	1009
115 cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier(). aziz parents: 114 diff changeset	1010 nT(); // Skip interface keyword.
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	1011 name = requireId();
112 004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	1012
004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	1013 if (token.type == T.LParen)
004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	1014 {
195 37c2ffd649c4 - Parsing template parameter list for class, interface, struct and union declarations. aziz parents: 194 diff changeset	1015 tparams = parseTemplateParameterList();
112 004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	1016 }
004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	1017
004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	1018 if (token.type == T.Colon)
004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	1019 bases = parseBaseClasses();
004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	1020
004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	1021 if (token.type == T.Semicolon)
004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	1022 {
004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	1023 //if (bases.length != 0)
115 cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier(). aziz parents: 114 diff changeset	1024 // TODO: error: base classes are not allowed in forward declarations.
112 004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	1025 nT();
004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	1026 }
004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	1027 else if (token.type == T.LBrace)
004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	1028 {
126 0f0e7352e91d - Renamed member hasDefinition of class Declaration to hasBody. aziz parents: 125 diff changeset	1029 hasBody = true;
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	1030 decls = parseDeclarationDefinitionsBlock();
112 004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	1031 }
004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	1032 else
124 d4c4cea6ee7f - Renamed method errorIfNot() to expected(). aziz parents: 123 diff changeset	1033 expected(T.LBrace); // TODO: better error msg
112 004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	1034
195 37c2ffd649c4 - Parsing template parameter list for class, interface, struct and union declarations. aziz parents: 194 diff changeset	1035 return new InterfaceDeclaration(name, tparams, bases, decls, hasBody);
112 004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	1036 }
004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	1037
113 20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	1038 Declaration parseAggregateDeclaration()
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	1039 {
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	1040 assert(token.type == T.Struct \|\| token.type == T.Union);
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	1041
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	1042 TOK tok = token.type;
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	1043
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	1044 Token* name;
258 112a57f433f2 - Created class TemplateParameters. aziz parents: 257 diff changeset	1045 TemplateParameters tparams;
305 df237b3b5f09 - Added class Declarations. aziz parents: 304 diff changeset	1046 Declarations decls;
126 0f0e7352e91d - Renamed member hasDefinition of class Declaration to hasBody. aziz parents: 125 diff changeset	1047 bool hasBody;
113 20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	1048
115 cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier(). aziz parents: 114 diff changeset	1049 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	1050 // name is optional.
113 20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	1051 if (token.type == T.Identifier)
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	1052 {
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	1053 name = token;
113 20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	1054 nT();
115 cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier(). aziz parents: 114 diff changeset	1055 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	1056 {
195 37c2ffd649c4 - Parsing template parameter list for class, interface, struct and union declarations. aziz parents: 194 diff changeset	1057 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	1058 }
113 20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	1059 }
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	1060
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	1061 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	1062 {
cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier(). aziz parents: 114 diff changeset	1063 //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	1064 // TODO: error: forward declarations must have a name.
113 20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	1065 nT();
115 cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier(). aziz parents: 114 diff changeset	1066 }
113 20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	1067 else if (token.type == T.LBrace)
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	1068 {
126 0f0e7352e91d - Renamed member hasDefinition of class Declaration to hasBody. aziz parents: 125 diff changeset	1069 hasBody = true;
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	1070 decls = parseDeclarationDefinitionsBlock();
113 20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	1071 }
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	1072 else
124 d4c4cea6ee7f - Renamed method errorIfNot() to expected(). aziz parents: 123 diff changeset	1073 expected(T.LBrace); // TODO: better error msg
113 20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	1074
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	1075 if (tok == T.Struct)
195 37c2ffd649c4 - Parsing template parameter list for class, interface, struct and union declarations. aziz parents: 194 diff changeset	1076 return new StructDeclaration(name, tparams, decls, hasBody);
113 20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	1077 else
195 37c2ffd649c4 - Parsing template parameter list for class, interface, struct and union declarations. aziz parents: 194 diff changeset	1078 return new UnionDeclaration(name, tparams, decls, hasBody);
113 20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	1079 }
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	1080
117 79857de26e86 - Moved class Parameter to module Types. Added struct Parameters. aziz parents: 116 diff changeset	1081 Declaration parseConstructorDeclaration()
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters. aziz parents: 116 diff changeset	1082 {
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters. aziz parents: 116 diff changeset	1083 assert(token.type == T.This);
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters. aziz parents: 116 diff changeset	1084 nT(); // Skip 'this' keyword.
143 e760d7552f66 - Renamed parseArgumentList() to parseArguments(). aziz parents: 141 diff changeset	1085 auto parameters = parseParameterList();
267 f3dfa6208ed3 - Removed parameter func from parseFunctionBody(). Creating new FunctionBody inside the method. aziz parents: 266 diff changeset	1086 auto funcBody = parseFunctionBody();
197 ff32eb87300e - Using parseFunctionBody() for Constructor-,Destructor-,StaticConstructor-,StaticDestructor-,Invariant-,Unittest-,New- and DeleteDeclaration. aziz parents: 196 diff changeset	1087 return new ConstructorDeclaration(parameters, funcBody);
117 79857de26e86 - Moved class Parameter to module Types. Added struct Parameters. aziz parents: 116 diff changeset	1088 }
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters. aziz parents: 116 diff changeset	1089
118 379f33cbd521 - Added parseDestructorDeclaration() and DestructorDeclaration class. aziz parents: 117 diff changeset	1090 Declaration parseDestructorDeclaration()
379f33cbd521 - Added parseDestructorDeclaration() and DestructorDeclaration class. aziz parents: 117 diff changeset	1091 {
379f33cbd521 - Added parseDestructorDeclaration() and DestructorDeclaration class. aziz parents: 117 diff changeset	1092 assert(token.type == T.Tilde);
379f33cbd521 - Added parseDestructorDeclaration() and DestructorDeclaration class. aziz parents: 117 diff changeset	1093 nT(); // Skip ~
379f33cbd521 - Added parseDestructorDeclaration() and DestructorDeclaration class. aziz parents: 117 diff changeset	1094 require(T.This);
379f33cbd521 - Added parseDestructorDeclaration() and DestructorDeclaration class. aziz parents: 117 diff changeset	1095 require(T.LParen);
379f33cbd521 - Added parseDestructorDeclaration() and DestructorDeclaration class. aziz parents: 117 diff changeset	1096 require(T.RParen);
267 f3dfa6208ed3 - Removed parameter func from parseFunctionBody(). Creating new FunctionBody inside the method. aziz parents: 266 diff changeset	1097 auto funcBody = parseFunctionBody();
197 ff32eb87300e - Using parseFunctionBody() for Constructor-,Destructor-,StaticConstructor-,StaticDestructor-,Invariant-,Unittest-,New- and DeleteDeclaration. aziz parents: 196 diff changeset	1098 return new DestructorDeclaration(funcBody);
118 379f33cbd521 - Added parseDestructorDeclaration() and DestructorDeclaration class. aziz parents: 117 diff changeset	1099 }
379f33cbd521 - Added parseDestructorDeclaration() and DestructorDeclaration class. aziz parents: 117 diff changeset	1100
119 363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	1101 Declaration parseStaticConstructorDeclaration()
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	1102 {
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	1103 assert(token.type == T.Static);
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	1104 nT(); // Skip static keyword.
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	1105 nT(); // Skip 'this' keyword.
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	1106 require(T.LParen);
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	1107 require(T.RParen);
267 f3dfa6208ed3 - Removed parameter func from parseFunctionBody(). Creating new FunctionBody inside the method. aziz parents: 266 diff changeset	1108 auto funcBody = parseFunctionBody();
197 ff32eb87300e - Using parseFunctionBody() for Constructor-,Destructor-,StaticConstructor-,StaticDestructor-,Invariant-,Unittest-,New- and DeleteDeclaration. aziz parents: 196 diff changeset	1109 return new StaticConstructorDeclaration(funcBody);
119 363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	1110 }
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	1111
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	1112 Declaration parseStaticDestructorDeclaration()
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	1113 {
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	1114 assert(token.type == T.Static);
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	1115 nT(); // Skip static keyword.
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	1116 nT(); // Skip ~
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	1117 require(T.This);
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	1118 require(T.LParen);
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	1119 require(T.RParen);
267 f3dfa6208ed3 - Removed parameter func from parseFunctionBody(). Creating new FunctionBody inside the method. aziz parents: 266 diff changeset	1120 auto funcBody = parseFunctionBody();
197 ff32eb87300e - Using parseFunctionBody() for Constructor-,Destructor-,StaticConstructor-,StaticDestructor-,Invariant-,Unittest-,New- and DeleteDeclaration. aziz parents: 196 diff changeset	1121 return new StaticDestructorDeclaration(funcBody);
119 363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	1122 }
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	1123
120 e5329dac0405 - Added parseInvariantDeclaration(). aziz parents: 119 diff changeset	1124 Declaration parseInvariantDeclaration()
e5329dac0405 - Added parseInvariantDeclaration(). aziz parents: 119 diff changeset	1125 {
e5329dac0405 - Added parseInvariantDeclaration(). aziz parents: 119 diff changeset	1126 assert(token.type == T.Invariant);
e5329dac0405 - Added parseInvariantDeclaration(). aziz parents: 119 diff changeset	1127 nT(); // Skip invariant keyword.
e5329dac0405 - Added parseInvariantDeclaration(). aziz parents: 119 diff changeset	1128 // Optional () for getting ready porting to D 2.0
e5329dac0405 - Added parseInvariantDeclaration(). aziz parents: 119 diff changeset	1129 if (token.type == T.LParen)
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	1130 requireNext(T.RParen);
267 f3dfa6208ed3 - Removed parameter func from parseFunctionBody(). Creating new FunctionBody inside the method. aziz parents: 266 diff changeset	1131 auto funcBody = parseFunctionBody();
197 ff32eb87300e - Using parseFunctionBody() for Constructor-,Destructor-,StaticConstructor-,StaticDestructor-,Invariant-,Unittest-,New- and DeleteDeclaration. aziz parents: 196 diff changeset	1132 return new InvariantDeclaration(funcBody);
120 e5329dac0405 - Added parseInvariantDeclaration(). aziz parents: 119 diff changeset	1133 }
e5329dac0405 - Added parseInvariantDeclaration(). aziz parents: 119 diff changeset	1134
121 030933c6b5f0 - Added parseUnittestDeclaration(). aziz parents: 120 diff changeset	1135 Declaration parseUnittestDeclaration()
030933c6b5f0 - Added parseUnittestDeclaration(). aziz parents: 120 diff changeset	1136 {
030933c6b5f0 - Added parseUnittestDeclaration(). aziz parents: 120 diff changeset	1137 assert(token.type == T.Unittest);
030933c6b5f0 - Added parseUnittestDeclaration(). aziz parents: 120 diff changeset	1138
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	1139 nT(); // Skip unittest keyword.
267 f3dfa6208ed3 - Removed parameter func from parseFunctionBody(). Creating new FunctionBody inside the method. aziz parents: 266 diff changeset	1140 auto funcBody = parseFunctionBody();
197 ff32eb87300e - Using parseFunctionBody() for Constructor-,Destructor-,StaticConstructor-,StaticDestructor-,Invariant-,Unittest-,New- and DeleteDeclaration. aziz parents: 196 diff changeset	1141 return new UnittestDeclaration(funcBody);
121 030933c6b5f0 - Added parseUnittestDeclaration(). aziz parents: 120 diff changeset	1142 }
030933c6b5f0 - Added parseUnittestDeclaration(). aziz parents: 120 diff changeset	1143
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	1144 Declaration parseDebugDeclaration()
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	1145 {
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	1146 assert(token.type == T.Debug);
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	1147
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	1148 nT(); // Skip debug keyword.
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	1149
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	1150 Token* spec; // debug = Integer ;
50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	1151 // debug = Identifier ;
50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	1152 Token* cond; // debug ( Integer )
50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	1153 // debug ( Identifier )
305 df237b3b5f09 - Added class Declarations. aziz parents: 304 diff changeset	1154 Declaration decls, elseDecls;
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	1155
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	1156 void parseIdentOrInt(ref Token* tok)
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	1157 {
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	1158 nT();
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	1159 if (token.type == T.Int32 \|\|
50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	1160 token.type == T.Identifier)
50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	1161 {
50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	1162 tok = token;
50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	1163 nT();
50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	1164 }
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	1165 else
124 d4c4cea6ee7f - Renamed method errorIfNot() to expected(). aziz parents: 123 diff changeset	1166 expected(T.Identifier); // TODO: better error msg
123 0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1167 }
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1168
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1169 if (token.type == T.Assign)
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1170 {
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	1171 parseIdentOrInt(spec);
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	1172 require(T.Semicolon);
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	1173 }
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	1174 else
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	1175 {
123 0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1176 // Condition:
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1177 // Integer
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1178 // Identifier
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1179 // ( Condition )
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	1180 if (token.type == T.LParen)
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	1181 {
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	1182 parseIdentOrInt(cond);
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	1183 require(T.RParen);
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	1184 }
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	1185
123 0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1186 // debug DeclarationsBlock
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1187 // debug ( Condition ) DeclarationsBlock
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1188 decls = parseDeclarationsBlock();
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1189
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1190 // else DeclarationsBlock
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	1191 if (token.type == T.Else)
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	1192 {
123 0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1193 nT();
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1194 //if (token.type == T.Colon)
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1195 // TODO: avoid "else:"?
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1196 elseDecls = parseDeclarationsBlock();
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1197 }
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1198 }
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1199
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	1200 return new DebugDeclaration(spec, cond, decls, elseDecls);
123 0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1201 }
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1202
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1203 Declaration parseVersionDeclaration()
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1204 {
146 8180eb84e69c - Started implementation of parseAttributeSpecifier(). aziz parents: 145 diff changeset	1205 assert(token.type == T.Version);
123 0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1206
146 8180eb84e69c - Started implementation of parseAttributeSpecifier(). aziz parents: 145 diff changeset	1207 nT(); // Skip version keyword.
123 0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1208
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	1209 Token* spec; // version = Integer ;
50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	1210 // version = Identifier ;
50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	1211 Token* cond; // version ( Integer )
50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	1212 // version ( Identifier )
305 df237b3b5f09 - Added class Declarations. aziz parents: 304 diff changeset	1213 Declaration decls, elseDecls;
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	1214
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	1215 void parseIdentOrInt(ref Token* tok)
123 0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1216 {
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	1217 if (token.type == T.Int32 \|\|
50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	1218 token.type == T.Identifier)
50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	1219 {
50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	1220 tok = token;
50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	1221 nT();
50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	1222 }
123 0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1223 else
124 d4c4cea6ee7f - Renamed method errorIfNot() to expected(). aziz parents: 123 diff changeset	1224 expected(T.Identifier); // TODO: better error msg
123 0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1225 }
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1226
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1227 if (token.type == T.Assign)
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1228 {
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	1229 nT();
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	1230 parseIdentOrInt(spec);
123 0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1231 require(T.Semicolon);
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1232 }
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1233 else
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1234 {
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1235 // Condition:
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1236 // Integer
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1237 // Identifier
146 8180eb84e69c - Started implementation of parseAttributeSpecifier(). aziz parents: 145 diff changeset	1238
123 0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1239 // ( Condition )
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1240 require(T.LParen);
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	1241 parseIdentOrInt(cond);
123 0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1242 require(T.RParen);
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1243
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1244 // version ( Condition ) DeclarationsBlock
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1245 decls = parseDeclarationsBlock();
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1246
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1247 // else DeclarationsBlock
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1248 if (token.type == T.Else)
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1249 {
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1250 nT();
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1251 //if (token.type == T.Colon)
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1252 // TODO: avoid "else:"?
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1253 elseDecls = parseDeclarationsBlock();
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	1254 }
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	1255 }
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	1256
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	1257 return new VersionDeclaration(spec, cond, decls, elseDecls);
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	1258 }
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	1259
125 240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	1260 Declaration parseStaticIfDeclaration()
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	1261 {
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	1262 assert(token.type == T.Static);
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	1263
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	1264 nT(); // Skip static keyword.
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	1265 nT(); // Skip if keyword.
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	1266
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	1267 Expression condition;
305 df237b3b5f09 - Added class Declarations. aziz parents: 304 diff changeset	1268 Declaration ifDecls, elseDecls;
125 240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	1269
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	1270 require(T.LParen);
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	1271 condition = parseAssignExpression();
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	1272 require(T.RParen);
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	1273
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	1274 if (token.type != T.Colon)
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	1275 ifDecls = parseDeclarationsBlock();
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	1276 else
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	1277 expected(T.LBrace); // TODO: better error msg
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	1278
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	1279 if (token.type == T.Else)
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	1280 {
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	1281 nT();
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	1282 if (token.type != T.Colon)
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	1283 elseDecls = parseDeclarationsBlock();
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	1284 else
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	1285 expected(T.LBrace); // TODO: better error msg
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	1286 }
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	1287
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	1288 return new StaticIfDeclaration(condition, ifDecls, elseDecls);
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	1289 }
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	1290
127 cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration. aziz parents: 126 diff changeset	1291 Declaration parseStaticAssertDeclaration()
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration. aziz parents: 126 diff changeset	1292 {
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration. aziz parents: 126 diff changeset	1293 assert(token.type == T.Static);
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration. aziz parents: 126 diff changeset	1294
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration. aziz parents: 126 diff changeset	1295 nT(); // Skip static keyword.
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration. aziz parents: 126 diff changeset	1296 nT(); // Skip assert keyword.
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration. aziz parents: 126 diff changeset	1297
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration. aziz parents: 126 diff changeset	1298 Expression condition, message;
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration. aziz parents: 126 diff changeset	1299
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration. aziz parents: 126 diff changeset	1300 require(T.LParen);
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration. aziz parents: 126 diff changeset	1301
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration. aziz parents: 126 diff changeset	1302 condition = parseAssignExpression();
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration. aziz parents: 126 diff changeset	1303
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration. aziz parents: 126 diff changeset	1304 if (token.type == T.Comma)
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration. aziz parents: 126 diff changeset	1305 {
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration. aziz parents: 126 diff changeset	1306 nT();
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration. aziz parents: 126 diff changeset	1307 message = parseAssignExpression();
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration. aziz parents: 126 diff changeset	1308 }
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration. aziz parents: 126 diff changeset	1309
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration. aziz parents: 126 diff changeset	1310 require(T.RParen);
128 e02b87281b4e - Static asserts have to end with a semicolon. aziz parents: 127 diff changeset	1311 require(T.Semicolon);
127 cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration. aziz parents: 126 diff changeset	1312
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration. aziz parents: 126 diff changeset	1313 return new StaticAssertDeclaration(condition, message);
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration. aziz parents: 126 diff changeset	1314 }
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration. aziz parents: 126 diff changeset	1315
140 64d7186b087c - Implemented parseTemplateParameters(). aziz parents: 139 diff changeset	1316 Declaration parseTemplateDeclaration()
64d7186b087c - Implemented parseTemplateParameters(). aziz parents: 139 diff changeset	1317 {
64d7186b087c - Implemented parseTemplateParameters(). aziz parents: 139 diff changeset	1318 assert(token.type == T.Template);
64d7186b087c - Implemented parseTemplateParameters(). aziz parents: 139 diff changeset	1319 nT(); // Skip template keyword.
265 3a2a0a63c638 - Changed some string types to Token. aziz* parents: 264 diff changeset	1320 auto templateName = requireId();
143 e760d7552f66 - Renamed parseArgumentList() to parseArguments(). aziz parents: 141 diff changeset	1321 auto templateParams = parseTemplateParameterList();
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	1322 auto decls = parseDeclarationDefinitionsBlock();
140 64d7186b087c - Implemented parseTemplateParameters(). aziz parents: 139 diff changeset	1323 return new TemplateDeclaration(templateName, templateParams, decls);
64d7186b087c - Implemented parseTemplateParameters(). aziz parents: 139 diff changeset	1324 }
64d7186b087c - Implemented parseTemplateParameters(). aziz parents: 139 diff changeset	1325
141 7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration(). aziz parents: 140 diff changeset	1326 Declaration parseNewDeclaration()
7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration(). aziz parents: 140 diff changeset	1327 {
7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration(). aziz parents: 140 diff changeset	1328 assert(token.type == T.New);
7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration(). aziz parents: 140 diff changeset	1329 nT(); // Skip new keyword.
143 e760d7552f66 - Renamed parseArgumentList() to parseArguments(). aziz parents: 141 diff changeset	1330 auto parameters = parseParameterList();
267 f3dfa6208ed3 - Removed parameter func from parseFunctionBody(). Creating new FunctionBody inside the method. aziz parents: 266 diff changeset	1331 auto funcBody = parseFunctionBody();
197 ff32eb87300e - Using parseFunctionBody() for Constructor-,Destructor-,StaticConstructor-,StaticDestructor-,Invariant-,Unittest-,New- and DeleteDeclaration. aziz parents: 196 diff changeset	1332 return new NewDeclaration(parameters, funcBody);
141 7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration(). aziz parents: 140 diff changeset	1333 }
7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration(). aziz parents: 140 diff changeset	1334
7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration(). aziz parents: 140 diff changeset	1335 Declaration parseDeleteDeclaration()
7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration(). aziz parents: 140 diff changeset	1336 {
7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration(). aziz parents: 140 diff changeset	1337 assert(token.type == T.Delete);
7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration(). aziz parents: 140 diff changeset	1338 nT(); // Skip delete keyword.
143 e760d7552f66 - Renamed parseArgumentList() to parseArguments(). aziz parents: 141 diff changeset	1339 auto parameters = parseParameterList();
197 ff32eb87300e - Using parseFunctionBody() for Constructor-,Destructor-,StaticConstructor-,StaticDestructor-,Invariant-,Unittest-,New- and DeleteDeclaration. aziz parents: 196 diff changeset	1340 // 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	1341 auto funcBody = parseFunctionBody();
197 ff32eb87300e - Using parseFunctionBody() for Constructor-,Destructor-,StaticConstructor-,StaticDestructor-,Invariant-,Unittest-,New- and DeleteDeclaration. aziz parents: 196 diff changeset	1342 return new DeleteDeclaration(parameters, funcBody);
141 7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration(). aziz parents: 140 diff changeset	1343 }
7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration(). aziz parents: 140 diff changeset	1344
154 0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1345 /+
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1346 DotListExpression:
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1347 . DotListItems
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1348 DotListItems
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1349 Typeof
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1350 Typeof . DotListItems
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1351 DotListItems:
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1352 DotListItem
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1353 DotListItem . DotListItems
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1354 DotListItem:
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1355 Identifier
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1356 TemplateInstance
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1357 NewExpression
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1358 TemplateInstance:
233 c2b601dcd57d - Added assert to parseDotListExpression(). aziz parents: 232 diff changeset	1359 Identifier !( TemplateArguments )
154 0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1360 +/
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1361 DotListExpression parseDotListExpression()
152 fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression. aziz parents: 151 diff changeset	1362 {
233 c2b601dcd57d - Added assert to parseDotListExpression(). aziz parents: 232 diff changeset	1363 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	1364 Expression[] identList;
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression. aziz parents: 151 diff changeset	1365 if (token.type == T.Dot)
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression. aziz parents: 151 diff changeset	1366 {
252 788398655d24 - Changed some string types to Token. Adapted parser accordingly. aziz* parents: 251 diff changeset	1367 identList ~= new IdentifierExpression(token);
152 fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression. aziz parents: 151 diff changeset	1368 nT();
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression. aziz parents: 151 diff changeset	1369 }
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression. aziz parents: 151 diff changeset	1370 else if (token.type == T.Typeof)
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression. aziz parents: 151 diff changeset	1371 {
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression. aziz parents: 151 diff changeset	1372 requireNext(T.LParen);
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression. aziz parents: 151 diff changeset	1373 auto type = new TypeofType(parseExpression());
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression. aziz parents: 151 diff changeset	1374 require(T.RParen);
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression. aziz parents: 151 diff changeset	1375 identList ~= new TypeofExpression(type);
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression. aziz parents: 151 diff changeset	1376 if (token.type != T.Dot)
154 0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1377 goto Lreturn;
152 fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression. aziz parents: 151 diff changeset	1378 nT();
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression. aziz parents: 151 diff changeset	1379 }
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression. aziz parents: 151 diff changeset	1380
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression. aziz parents: 151 diff changeset	1381 while (1)
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression. aziz parents: 151 diff changeset	1382 {
321 ae7f48182cb1 - Added some calls to set(). aziz parents: 320 diff changeset	1383 auto begin2 = token;
252 788398655d24 - Changed some string types to Token. Adapted parser accordingly. aziz* parents: 251 diff changeset	1384 auto ident = requireId();
788398655d24 - Changed some string types to Token. Adapted parser accordingly. aziz* parents: 251 diff changeset	1385 Expression e;
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1386 if (token.type == T.Not && peekNext() == T.LParen) // Identifier !( TemplateArguments )
152 fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression. aziz parents: 151 diff changeset	1387 {
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression. aziz parents: 151 diff changeset	1388 nT(); // Skip !.
321 ae7f48182cb1 - Added some calls to set(). aziz parents: 320 diff changeset	1389 e = set(new TemplateInstanceExpression(ident, parseTemplateArguments()), begin2);
152 fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression. aziz parents: 151 diff changeset	1390 }
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression. aziz parents: 151 diff changeset	1391 else // Identifier
321 ae7f48182cb1 - Added some calls to set(). aziz parents: 320 diff changeset	1392 e = set(new IdentifierExpression(ident), begin2);
252 788398655d24 - Changed some string types to Token. Adapted parser accordingly. aziz* parents: 251 diff changeset	1393
788398655d24 - Changed some string types to Token. Adapted parser accordingly. aziz* parents: 251 diff changeset	1394 identList ~= e;
152 fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression. aziz parents: 151 diff changeset	1395
154 0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1396 LnewExpressionLoop:
152 fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression. aziz parents: 151 diff changeset	1397 if (token.type != T.Dot)
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression. aziz parents: 151 diff changeset	1398 break;
154 0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1399 nT(); // Skip dot.
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1400
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1401 if (token.type == T.New)
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1402 {
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1403 identList ~= parseNewExpression();
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1404 goto LnewExpressionLoop;
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1405 }
152 fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression. aziz parents: 151 diff changeset	1406 }
233 c2b601dcd57d - Added assert to parseDotListExpression(). aziz parents: 232 diff changeset	1407
154 0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1408 Lreturn:
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1409 return new DotListExpression(identList);
152 fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression. aziz parents: 151 diff changeset	1410 }
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression. aziz parents: 151 diff changeset	1411
154 0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1412 /+
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1413 DotListType:
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1414 . TypeItems
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1415 TypeItems
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1416 Typeof
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1417 Typeof . TypeItems
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1418 TypeItems:
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1419 TypeItem
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1420 TypeItem . TypeItems
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1421 TypeItem:
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1422 Identifier
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1423 TemplateInstance
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1424 TemplateInstance:
233 c2b601dcd57d - Added assert to parseDotListExpression(). aziz parents: 232 diff changeset	1425 Identifier !( TemplateArguments )
154 0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1426 +/
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1427 DotListType parseDotListType()
153 66790fc2c0a2 - Added method parseIdentifierListType(). aziz parents: 152 diff changeset	1428 {
66790fc2c0a2 - Added method parseIdentifierListType(). aziz parents: 152 diff changeset	1429 Type[] identList;
66790fc2c0a2 - Added method parseIdentifierListType(). aziz parents: 152 diff changeset	1430 if (token.type == T.Dot)
66790fc2c0a2 - Added method parseIdentifierListType(). aziz parents: 152 diff changeset	1431 {
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	1432 identList ~= new IdentifierType(token);
153 66790fc2c0a2 - Added method parseIdentifierListType(). aziz parents: 152 diff changeset	1433 nT();
66790fc2c0a2 - Added method parseIdentifierListType(). aziz parents: 152 diff changeset	1434 }
66790fc2c0a2 - Added method parseIdentifierListType(). aziz parents: 152 diff changeset	1435 else if (token.type == T.Typeof)
66790fc2c0a2 - Added method parseIdentifierListType(). aziz parents: 152 diff changeset	1436 {
66790fc2c0a2 - Added method parseIdentifierListType(). aziz parents: 152 diff changeset	1437 requireNext(T.LParen);
66790fc2c0a2 - Added method parseIdentifierListType(). aziz parents: 152 diff changeset	1438 identList ~= new TypeofType(parseExpression());
66790fc2c0a2 - Added method parseIdentifierListType(). aziz parents: 152 diff changeset	1439 require(T.RParen);
66790fc2c0a2 - Added method parseIdentifierListType(). aziz parents: 152 diff changeset	1440 if (token.type != T.Dot)
154 0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1441 goto Lreturn;
153 66790fc2c0a2 - Added method parseIdentifierListType(). aziz parents: 152 diff changeset	1442 nT();
66790fc2c0a2 - Added method parseIdentifierListType(). aziz parents: 152 diff changeset	1443 }
66790fc2c0a2 - Added method parseIdentifierListType(). aziz parents: 152 diff changeset	1444
66790fc2c0a2 - Added method parseIdentifierListType(). aziz parents: 152 diff changeset	1445 while (1)
66790fc2c0a2 - Added method parseIdentifierListType(). aziz parents: 152 diff changeset	1446 {
321 ae7f48182cb1 - Added some calls to set(). aziz parents: 320 diff changeset	1447 auto begin2 = token;
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	1448 auto ident = requireId();
154 0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1449 // 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	1450 if (token.type == T.Not/+ && peekNext() == T.LParen+/) // Identifier !( TemplateArguments )
153 66790fc2c0a2 - Added method parseIdentifierListType(). aziz parents: 152 diff changeset	1451 {
66790fc2c0a2 - Added method parseIdentifierListType(). aziz parents: 152 diff changeset	1452 nT(); // Skip !.
321 ae7f48182cb1 - Added some calls to set(). aziz parents: 320 diff changeset	1453 identList ~= set(new TemplateInstanceType(ident, parseTemplateArguments()), begin2);
153 66790fc2c0a2 - Added method parseIdentifierListType(). aziz parents: 152 diff changeset	1454 }
66790fc2c0a2 - Added method parseIdentifierListType(). aziz parents: 152 diff changeset	1455 else // Identifier
321 ae7f48182cb1 - Added some calls to set(). aziz parents: 320 diff changeset	1456 identList ~= set(new IdentifierType(ident), begin2);
153 66790fc2c0a2 - Added method parseIdentifierListType(). aziz parents: 152 diff changeset	1457
66790fc2c0a2 - Added method parseIdentifierListType(). aziz parents: 152 diff changeset	1458 if (token.type != T.Dot)
66790fc2c0a2 - Added method parseIdentifierListType(). aziz parents: 152 diff changeset	1459 break;
66790fc2c0a2 - Added method parseIdentifierListType(). aziz parents: 152 diff changeset	1460 nT();
66790fc2c0a2 - Added method parseIdentifierListType(). aziz parents: 152 diff changeset	1461 }
154 0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1462 Lreturn:
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	1463 return new DotListType(identList);
153 66790fc2c0a2 - Added method parseIdentifierListType(). aziz parents: 152 diff changeset	1464 }
66790fc2c0a2 - Added method parseIdentifierListType(). aziz parents: 152 diff changeset	1465
150 753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1466 /*
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1467 TemplateMixin:
151 2e959f67000b - Added code for parsing mixin expression declarations. aziz parents: 150 diff changeset	1468 mixin ( AssignExpression ) ;
150 753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1469 mixin TemplateIdentifier ;
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1470 mixin TemplateIdentifier MixinIdentifier ;
233 c2b601dcd57d - Added assert to parseDotListExpression(). aziz parents: 232 diff changeset	1471 mixin TemplateIdentifier !( TemplateArguments ) ;
c2b601dcd57d - Added assert to parseDotListExpression(). aziz parents: 232 diff changeset	1472 mixin TemplateIdentifier !( TemplateArguments ) MixinIdentifier ;
150 753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1473 */
256 8f27920ae17a - Made parseMixinDeclaration() a template. aziz parents: 255 diff changeset	1474 Class parseMixin(Class)()
150 753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1475 {
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1476 assert(token.type == T.Mixin);
256 8f27920ae17a - Made parseMixinDeclaration() a template. aziz parents: 255 diff changeset	1477 auto begin = token;
150 753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1478 nT(); // Skip mixin keyword.
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1479
256 8f27920ae17a - Made parseMixinDeclaration() a template. aziz parents: 255 diff changeset	1480 static if (is(Class == MixinDeclaration))
301 caef255a2801 - Fix in some ctors: adding only non-null members to this.children. aziz parents: 299 diff changeset	1481 {
151 2e959f67000b - Added code for parsing mixin expression declarations. aziz parents: 150 diff changeset	1482 if (token.type == T.LParen)
2e959f67000b - Added code for parsing mixin expression declarations. aziz parents: 150 diff changeset	1483 {
2e959f67000b - Added code for parsing mixin expression declarations. aziz parents: 150 diff changeset	1484 // TODO: What about mixin(...).ident;?
2e959f67000b - Added code for parsing mixin expression declarations. aziz parents: 150 diff changeset	1485 nT();
2e959f67000b - Added code for parsing mixin expression declarations. aziz parents: 150 diff changeset	1486 auto e = parseAssignExpression();
2e959f67000b - Added code for parsing mixin expression declarations. aziz parents: 150 diff changeset	1487 require(T.RParen);
2e959f67000b - Added code for parsing mixin expression declarations. aziz parents: 150 diff changeset	1488 require(T.Semicolon);
262 0f22269e76ff - Changed some string types to Token. aziz* parents: 261 diff changeset	1489 return new MixinDeclaration(e);
151 2e959f67000b - Added code for parsing mixin expression declarations. aziz parents: 150 diff changeset	1490 }
301 caef255a2801 - Fix in some ctors: adding only non-null members to this.children. aziz parents: 299 diff changeset	1491 }
151 2e959f67000b - Added code for parsing mixin expression declarations. aziz parents: 150 diff changeset	1492
150 753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1493 Expression[] templateIdent;
252 788398655d24 - Changed some string types to Token. Adapted parser accordingly. aziz* parents: 251 diff changeset	1494 Token* mixinIdent;
150 753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1495
159 5aa877506db0 - Added enum Linkage. aziz parents: 158 diff changeset	1496 // This code is similar to parseDotListType().
150 753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1497 if (token.type == T.Dot)
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1498 {
252 788398655d24 - Changed some string types to Token. Adapted parser accordingly. aziz* parents: 251 diff changeset	1499 templateIdent ~= new IdentifierExpression(token);
150 753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1500 nT();
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1501 }
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1502
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1503 while (1)
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1504 {
252 788398655d24 - Changed some string types to Token. Adapted parser accordingly. aziz* parents: 251 diff changeset	1505 auto ident = requireId();
788398655d24 - Changed some string types to Token. Adapted parser accordingly. aziz* parents: 251 diff changeset	1506 Expression e;
150 753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1507 if (token.type == T.Not) // Identifier !( TemplateArguments )
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1508 {
151 2e959f67000b - Added code for parsing mixin expression declarations. aziz parents: 150 diff changeset	1509 // 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	1510 nT();
252 788398655d24 - Changed some string types to Token. Adapted parser accordingly. aziz* parents: 251 diff changeset	1511 e = new TemplateInstanceExpression(ident, parseTemplateArguments());
150 753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1512 }
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1513 else // Identifier
252 788398655d24 - Changed some string types to Token. Adapted parser accordingly. aziz* parents: 251 diff changeset	1514 e = new IdentifierExpression(ident);
788398655d24 - Changed some string types to Token. Adapted parser accordingly. aziz* parents: 251 diff changeset	1515
788398655d24 - Changed some string types to Token. Adapted parser accordingly. aziz* parents: 251 diff changeset	1516 templateIdent ~= e;
150 753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1517
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1518 if (token.type != T.Dot)
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1519 break;
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1520 nT();
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1521 }
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1522
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1523 if (token.type == T.Identifier)
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1524 {
252 788398655d24 - Changed some string types to Token. Adapted parser accordingly. aziz* parents: 251 diff changeset	1525 mixinIdent = token;
150 753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1526 nT();
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1527 }
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1528
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1529 require(T.Semicolon);
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1530
262 0f22269e76ff - Changed some string types to Token. aziz* parents: 261 diff changeset	1531 return new Class(templateIdent, mixinIdent);
150 753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1532 }
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1533
102 6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	1534 /+++++++++++++++++++++++++++++
161 82c5cfc7d6d3 - Started implementation of parsing statements. aziz parents: 160 diff changeset	1535 + Statement parsing methods +
82c5cfc7d6d3 - Started implementation of parsing statements. aziz parents: 160 diff changeset	1536 +++++++++++++++++++++++++++++/
82c5cfc7d6d3 - Started implementation of parsing statements. aziz parents: 160 diff changeset	1537
82c5cfc7d6d3 - Started implementation of parsing statements. aziz parents: 160 diff changeset	1538 Statements parseStatements()
82c5cfc7d6d3 - Started implementation of parsing statements. aziz parents: 160 diff changeset	1539 {
262 0f22269e76ff - Changed some string types to Token. aziz* parents: 261 diff changeset	1540 auto begin = token;
318 a1c9d93a66e3 - Added member prevToken to Parser. aziz parents: 314 diff changeset	1541 require(T.LBrace);
162 c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	1542 auto statements = new Statements();
161 82c5cfc7d6d3 - Started implementation of parsing statements. aziz parents: 160 diff changeset	1543 while (token.type != T.RBrace && token.type != T.EOF)
82c5cfc7d6d3 - Started implementation of parsing statements. aziz parents: 160 diff changeset	1544 statements ~= parseStatement();
318 a1c9d93a66e3 - Added member prevToken to Parser. aziz parents: 314 diff changeset	1545 require(T.RBrace);
262 0f22269e76ff - Changed some string types to Token. aziz* parents: 261 diff changeset	1546 return set(statements, begin);
161 82c5cfc7d6d3 - Started implementation of parsing statements. aziz parents: 160 diff changeset	1547 }
82c5cfc7d6d3 - Started implementation of parsing statements. aziz parents: 160 diff changeset	1548
82c5cfc7d6d3 - Started implementation of parsing statements. aziz parents: 160 diff changeset	1549 Statement parseStatement()
82c5cfc7d6d3 - Started implementation of parsing statements. aziz parents: 160 diff changeset	1550 {
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	1551 // writefln("°parseStatement:(%d)token='%s'°", lx.loc, token.srcText);
261 966756c5d5d3 - Added begin variables and calls to set(). aziz parents: 260 diff changeset	1552 auto begin = token;
161 82c5cfc7d6d3 - Started implementation of parsing statements. aziz parents: 160 diff changeset	1553 Statement s;
188 5c6ebf9f60a9 - Added code for parsing DeclarationStatement. aziz parents: 187 diff changeset	1554 Declaration d;
161 82c5cfc7d6d3 - Started implementation of parsing statements. aziz parents: 160 diff changeset	1555 switch (token.type)
82c5cfc7d6d3 - Started implementation of parsing statements. aziz parents: 160 diff changeset	1556 {
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1557 case T.Align:
260 b83180748ae6 - Added method parseAlignAttribute(). aziz parents: 259 diff changeset	1558 int size = -1;
b83180748ae6 - Added method parseAlignAttribute(). aziz parents: 259 diff changeset	1559 auto intTok = parseAlignAttribute();
b83180748ae6 - Added method parseAlignAttribute(). aziz parents: 259 diff changeset	1560 if (intTok)
b83180748ae6 - Added method parseAlignAttribute(). aziz parents: 259 diff changeset	1561 size = intTok.int_;
b83180748ae6 - Added method parseAlignAttribute(). aziz parents: 259 diff changeset	1562 // Restrict align attribute to structs in parsing phase.
b83180748ae6 - Added method parseAlignAttribute(). aziz parents: 259 diff changeset	1563 Declaration structDecl;
b83180748ae6 - Added method parseAlignAttribute(). aziz parents: 259 diff changeset	1564 if (token.type == T.Struct)
b83180748ae6 - Added method parseAlignAttribute(). aziz parents: 259 diff changeset	1565 structDecl = parseAggregateDeclaration();
b83180748ae6 - Added method parseAlignAttribute(). aziz parents: 259 diff changeset	1566 else
b83180748ae6 - Added method parseAlignAttribute(). aziz parents: 259 diff changeset	1567 expected(T.Struct);
305 df237b3b5f09 - Added class Declarations. aziz parents: 304 diff changeset	1568 d = new AlignDeclaration(size, structDecl ? structDecl : new Declarations);
201 70715b9e2109 - Implemented parseAttributeStatement(). aziz parents: 200 diff changeset	1569 goto case_DeclarationStatement;
70715b9e2109 - Implemented parseAttributeStatement(). aziz parents: 200 diff changeset	1570 /+ Not applicable for statements.
191 3ce110cefbc5 - Added code for parsing AliasDeclaration and TypedefDeclaration. aziz parents: 190 diff changeset	1571 // T.Private,
3ce110cefbc5 - Added code for parsing AliasDeclaration and TypedefDeclaration. aziz parents: 190 diff changeset	1572 // T.Package,
3ce110cefbc5 - Added code for parsing AliasDeclaration and TypedefDeclaration. aziz parents: 190 diff changeset	1573 // T.Protected,
3ce110cefbc5 - Added code for parsing AliasDeclaration and TypedefDeclaration. aziz parents: 190 diff changeset	1574 // T.Public,
3ce110cefbc5 - Added code for parsing AliasDeclaration and TypedefDeclaration. aziz parents: 190 diff changeset	1575 // T.Export,
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1576 // T.Deprecated,
191 3ce110cefbc5 - Added code for parsing AliasDeclaration and TypedefDeclaration. aziz parents: 190 diff changeset	1577 // T.Override,
3ce110cefbc5 - Added code for parsing AliasDeclaration and TypedefDeclaration. aziz parents: 190 diff changeset	1578 // T.Abstract,
201 70715b9e2109 - Implemented parseAttributeStatement(). aziz parents: 200 diff changeset	1579 +/
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1580 case T.Extern,
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1581 T.Final,
191 3ce110cefbc5 - Added code for parsing AliasDeclaration and TypedefDeclaration. aziz parents: 190 diff changeset	1582 T.Const,
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1583 T.Auto:
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1584 //T.Scope
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1585 //T.Static
201 70715b9e2109 - Implemented parseAttributeStatement(). aziz parents: 200 diff changeset	1586 case_parseAttribute:
70715b9e2109 - Implemented parseAttributeStatement(). aziz parents: 200 diff changeset	1587 s = parseAttributeStatement();
261 966756c5d5d3 - Added begin variables and calls to set(). aziz parents: 260 diff changeset	1588 return s;
161 82c5cfc7d6d3 - Started implementation of parsing statements. aziz parents: 160 diff changeset	1589 case T.Identifier:
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1590 if (peekNext() == T.Colon)
161 82c5cfc7d6d3 - Started implementation of parsing statements. aziz parents: 160 diff changeset	1591 {
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	1592 auto ident = token;
161 82c5cfc7d6d3 - Started implementation of parsing statements. aziz parents: 160 diff changeset	1593 nT(); // Skip Identifier
82c5cfc7d6d3 - Started implementation of parsing statements. aziz parents: 160 diff changeset	1594 nT(); // Skip :
234 5c1111dc8670 - Added method parseNoScopeOrEmptyStatement(). aziz parents: 233 diff changeset	1595 s = new LabeledStatement(ident, parseNoScopeOrEmptyStatement());
161 82c5cfc7d6d3 - Started implementation of parsing statements. aziz parents: 160 diff changeset	1596 break;
82c5cfc7d6d3 - Started implementation of parsing statements. aziz parents: 160 diff changeset	1597 }
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	1598 goto case T.Dot;
201 70715b9e2109 - Implemented parseAttributeStatement(). aziz parents: 200 diff changeset	1599 case T.Dot, T.Typeof:
214 45fc474c1678 - Changed 'failed' parameter of try_() to 'success'. aziz parents: 213 diff changeset	1600 bool success;
45fc474c1678 - Changed 'failed' parameter of try_() to 'success'. aziz parents: 213 diff changeset	1601 d = try_(parseDeclaration(), success);
45fc474c1678 - Changed 'failed' parameter of try_() to 'success'. aziz parents: 213 diff changeset	1602 if (success)
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	1603 goto case_DeclarationStatement; // Declaration
201 70715b9e2109 - Implemented parseAttributeStatement(). aziz parents: 200 diff changeset	1604 else
70715b9e2109 - Implemented parseAttributeStatement(). aziz parents: 200 diff changeset	1605 goto default; // Expression
70715b9e2109 - Implemented parseAttributeStatement(). aziz parents: 200 diff changeset	1606 // BasicType
70715b9e2109 - Implemented parseAttributeStatement(). aziz parents: 200 diff changeset	1607 case T.Char, T.Wchar, T.Dchar, T.Bool,
70715b9e2109 - Implemented parseAttributeStatement(). aziz parents: 200 diff changeset	1608 T.Byte, T.Ubyte, T.Short, T.Ushort,
70715b9e2109 - Implemented parseAttributeStatement(). aziz parents: 200 diff changeset	1609 T.Int, T.Uint, T.Long, T.Ulong,
70715b9e2109 - Implemented parseAttributeStatement(). aziz parents: 200 diff changeset	1610 T.Float, T.Double, T.Real,
70715b9e2109 - Implemented parseAttributeStatement(). aziz parents: 200 diff changeset	1611 T.Ifloat, T.Idouble, T.Ireal,
70715b9e2109 - Implemented parseAttributeStatement(). aziz parents: 200 diff changeset	1612 T.Cfloat, T.Cdouble, T.Creal, T.Void:
70715b9e2109 - Implemented parseAttributeStatement(). aziz parents: 200 diff changeset	1613 case_parseDeclaration:
70715b9e2109 - Implemented parseAttributeStatement(). aziz parents: 200 diff changeset	1614 d = parseDeclaration();
70715b9e2109 - Implemented parseAttributeStatement(). aziz parents: 200 diff changeset	1615 goto case_DeclarationStatement;
162 c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	1616 case T.If:
c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	1617 s = parseIfStatement();
c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	1618 break;
164 8ec99326752b - Implemented parseWhileStatement(). aziz parents: 163 diff changeset	1619 case T.While:
8ec99326752b - Implemented parseWhileStatement(). aziz parents: 163 diff changeset	1620 s = parseWhileStatement();
8ec99326752b - Implemented parseWhileStatement(). aziz parents: 163 diff changeset	1621 break;
165 797074d143d7 - Implemented parseDoWhileStatement(). aziz parents: 164 diff changeset	1622 case T.Do:
797074d143d7 - Implemented parseDoWhileStatement(). aziz parents: 164 diff changeset	1623 s = parseDoWhileStatement();
797074d143d7 - Implemented parseDoWhileStatement(). aziz parents: 164 diff changeset	1624 break;
216 984d48932bce - Added class EmptyStatement. aziz parents: 214 diff changeset	1625 case T.For:
984d48932bce - Added class EmptyStatement. aziz parents: 214 diff changeset	1626 s = parseForStatement();
984d48932bce - Added class EmptyStatement. aziz parents: 214 diff changeset	1627 break;
169 4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	1628 case T.Foreach, T.Foreach_reverse:
4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	1629 s = parseForeachStatement();
4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	1630 break;
170 a63696d1c474 - Implemented parseSwitchStatement(). aziz parents: 169 diff changeset	1631 case T.Switch:
a63696d1c474 - Implemented parseSwitchStatement(). aziz parents: 169 diff changeset	1632 s = parseSwitchStatement();
a63696d1c474 - Implemented parseSwitchStatement(). aziz parents: 169 diff changeset	1633 break;
171 f1fa9bbdb4cb - Implemented parseCaseStatement(). aziz parents: 170 diff changeset	1634 case T.Case:
f1fa9bbdb4cb - Implemented parseCaseStatement(). aziz parents: 170 diff changeset	1635 s = parseCaseStatement();
f1fa9bbdb4cb - Implemented parseCaseStatement(). aziz parents: 170 diff changeset	1636 break;
172 89d4519bd8a1 - Implemented parseDefaultStatement(). aziz parents: 171 diff changeset	1637 case T.Default:
89d4519bd8a1 - Implemented parseDefaultStatement(). aziz parents: 171 diff changeset	1638 s = parseDefaultStatement();
89d4519bd8a1 - Implemented parseDefaultStatement(). aziz parents: 171 diff changeset	1639 break;
173 c2714ba44350 - Implemented parseContinueStatement(). aziz parents: 172 diff changeset	1640 case T.Continue:
c2714ba44350 - Implemented parseContinueStatement(). aziz parents: 172 diff changeset	1641 s = parseContinueStatement();
c2714ba44350 - Implemented parseContinueStatement(). aziz parents: 172 diff changeset	1642 break;
174 e51c9ee66ea0 - Implemented parseBreakStatement(). aziz parents: 173 diff changeset	1643 case T.Break:
e51c9ee66ea0 - Implemented parseBreakStatement(). aziz parents: 173 diff changeset	1644 s = parseBreakStatement();
e51c9ee66ea0 - Implemented parseBreakStatement(). aziz parents: 173 diff changeset	1645 break;
175 522df6f0f230 - Implemented parseReturnStatement(). aziz parents: 174 diff changeset	1646 case T.Return:
522df6f0f230 - Implemented parseReturnStatement(). aziz parents: 174 diff changeset	1647 s = parseReturnStatement();
522df6f0f230 - Implemented parseReturnStatement(). aziz parents: 174 diff changeset	1648 break;
176 3071522c0cf0 - Implemented parseGotoStatement(). aziz parents: 175 diff changeset	1649 case T.Goto:
3071522c0cf0 - Implemented parseGotoStatement(). aziz parents: 175 diff changeset	1650 s = parseGotoStatement();
3071522c0cf0 - Implemented parseGotoStatement(). aziz parents: 175 diff changeset	1651 break;
177 504b1b2f7c93 - Implemented parseWithStatement(). aziz parents: 176 diff changeset	1652 case T.With:
504b1b2f7c93 - Implemented parseWithStatement(). aziz parents: 176 diff changeset	1653 s = parseWithStatement();
504b1b2f7c93 - Implemented parseWithStatement(). aziz parents: 176 diff changeset	1654 break;
178 62718b29679e - Implemented parseSynchronizedStatement(). aziz parents: 177 diff changeset	1655 case T.Synchronized:
62718b29679e - Implemented parseSynchronizedStatement(). aziz parents: 177 diff changeset	1656 s = parseSynchronizedStatement();
62718b29679e - Implemented parseSynchronizedStatement(). aziz parents: 177 diff changeset	1657 break;
179 507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	1658 case T.Try:
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	1659 s = parseTryStatement();
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	1660 break;
180 d5a67aa578a8 - Implemented parseThrowStatement(). aziz parents: 179 diff changeset	1661 case T.Throw:
d5a67aa578a8 - Implemented parseThrowStatement(). aziz parents: 179 diff changeset	1662 s = parseThrowStatement();
d5a67aa578a8 - Implemented parseThrowStatement(). aziz parents: 179 diff changeset	1663 break;
181 abfd51142477 - Implemented parseScopeGuardStatement(). aziz parents: 180 diff changeset	1664 case T.Scope:
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1665 if (peekNext() != T.LParen)
201 70715b9e2109 - Implemented parseAttributeStatement(). aziz parents: 200 diff changeset	1666 goto case_parseAttribute;
181 abfd51142477 - Implemented parseScopeGuardStatement(). aziz parents: 180 diff changeset	1667 s = parseScopeGuardStatement();
abfd51142477 - Implemented parseScopeGuardStatement(). aziz parents: 180 diff changeset	1668 break;
182 673b355ba0e9 - Implemented parseVolatileStatement(). aziz parents: 181 diff changeset	1669 case T.Volatile:
673b355ba0e9 - Implemented parseVolatileStatement(). aziz parents: 181 diff changeset	1670 s = parseVolatileStatement();
673b355ba0e9 - Implemented parseVolatileStatement(). aziz parents: 181 diff changeset	1671 break;
183 c9df82f6f6be - Added parseAsmStatement() stub. aziz parents: 182 diff changeset	1672 case T.Asm:
c9df82f6f6be - Added parseAsmStatement() stub. aziz parents: 182 diff changeset	1673 s = parseAsmStatement();
c9df82f6f6be - Added parseAsmStatement() stub. aziz parents: 182 diff changeset	1674 break;
184 30a4c8522b09 - Implemented parsePragmaStatement(). aziz parents: 183 diff changeset	1675 case T.Pragma:
30a4c8522b09 - Implemented parsePragmaStatement(). aziz parents: 183 diff changeset	1676 s = parsePragmaStatement();
30a4c8522b09 - Implemented parsePragmaStatement(). aziz parents: 183 diff changeset	1677 break;
185 35c93b776be0 - Added code for parsing MixinStatements. aziz parents: 184 diff changeset	1678 case T.Mixin:
246 52f4aa097865 - Fix: parse mixin as expression instead of statement when next token is T.LParen. aziz parents: 245 diff changeset	1679 if (peekNext() == T.LParen)
52f4aa097865 - Fix: parse mixin as expression instead of statement when next token is T.LParen. aziz parents: 245 diff changeset	1680 goto default; // Parse as expression.
256 8f27920ae17a - Made parseMixinDeclaration() a template. aziz parents: 255 diff changeset	1681 s = parseMixin!(MixinStatement)();
185 35c93b776be0 - Added code for parsing MixinStatements. aziz parents: 184 diff changeset	1682 break;
186 d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	1683 case T.Static:
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1684 switch (peekNext())
186 d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	1685 {
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	1686 case T.If:
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	1687 s = parseStaticIfStatement();
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	1688 break;
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	1689 case T.Assert:
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	1690 s = parseStaticAssertStatement();
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	1691 break;
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	1692 default:
201 70715b9e2109 - Implemented parseAttributeStatement(). aziz parents: 200 diff changeset	1693 goto case_parseAttribute;
186 d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	1694 }
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1695 break;
190 d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	1696 case T.Debug:
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	1697 s = parseDebugStatement();
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	1698 break;
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	1699 case T.Version:
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	1700 s = parseVersionStatement();
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	1701 break;
226 aa38e1401217 - Fixed cases T.Alias and T.Typedef. Wrong function called. aziz parents: 225 diff changeset	1702 // DeclDef
aa38e1401217 - Fixed cases T.Alias and T.Typedef. Wrong function called. aziz parents: 225 diff changeset	1703 case T.Alias, T.Typedef:
aa38e1401217 - Fixed cases T.Alias and T.Typedef. Wrong function called. aziz parents: 225 diff changeset	1704 d = parseDeclarationDefinition();
aa38e1401217 - Fixed cases T.Alias and T.Typedef. Wrong function called. aziz parents: 225 diff changeset	1705 goto case_DeclarationStatement;
188 5c6ebf9f60a9 - Added code for parsing DeclarationStatement. aziz parents: 187 diff changeset	1706 case T.Enum:
5c6ebf9f60a9 - Added code for parsing DeclarationStatement. aziz parents: 187 diff changeset	1707 d = parseEnumDeclaration();
5c6ebf9f60a9 - Added code for parsing DeclarationStatement. aziz parents: 187 diff changeset	1708 goto case_DeclarationStatement;
5c6ebf9f60a9 - Added code for parsing DeclarationStatement. aziz parents: 187 diff changeset	1709 case T.Class:
5c6ebf9f60a9 - Added code for parsing DeclarationStatement. aziz parents: 187 diff changeset	1710 d = parseClassDeclaration();
5c6ebf9f60a9 - Added code for parsing DeclarationStatement. aziz parents: 187 diff changeset	1711 goto case_DeclarationStatement;
5c6ebf9f60a9 - Added code for parsing DeclarationStatement. aziz parents: 187 diff changeset	1712 case T.Interface:
5c6ebf9f60a9 - Added code for parsing DeclarationStatement. aziz parents: 187 diff changeset	1713 d = parseInterfaceDeclaration();
5c6ebf9f60a9 - Added code for parsing DeclarationStatement. aziz parents: 187 diff changeset	1714 goto case_DeclarationStatement;
5c6ebf9f60a9 - Added code for parsing DeclarationStatement. aziz parents: 187 diff changeset	1715 case T.Struct, T.Union:
5c6ebf9f60a9 - Added code for parsing DeclarationStatement. aziz parents: 187 diff changeset	1716 d = parseAggregateDeclaration();
5c6ebf9f60a9 - Added code for parsing DeclarationStatement. aziz parents: 187 diff changeset	1717 goto case_DeclarationStatement;
5c6ebf9f60a9 - Added code for parsing DeclarationStatement. aziz parents: 187 diff changeset	1718 case_DeclarationStatement:
261 966756c5d5d3 - Added begin variables and calls to set(). aziz parents: 260 diff changeset	1719 set(d, begin);
188 5c6ebf9f60a9 - Added code for parsing DeclarationStatement. aziz parents: 187 diff changeset	1720 s = new DeclarationStatement(d);
5c6ebf9f60a9 - Added code for parsing DeclarationStatement. aziz parents: 187 diff changeset	1721 break;
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	1722 case T.LBrace:
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	1723 s = parseScopeStatement();
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	1724 break;
216 984d48932bce - Added class EmptyStatement. aziz parents: 214 diff changeset	1725 case T.Semicolon:
231 6846138a0e24 - Fixed parseEnumDeclaration(). aziz parents: 230 diff changeset	1726 nT();
216 984d48932bce - Added class EmptyStatement. aziz parents: 214 diff changeset	1727 s = new EmptyStatement();
984d48932bce - Added class EmptyStatement. aziz parents: 214 diff changeset	1728 break;
161 82c5cfc7d6d3 - Started implementation of parsing statements. aziz parents: 160 diff changeset	1729 default:
214 45fc474c1678 - Changed 'failed' parameter of try_() to 'success'. aziz parents: 213 diff changeset	1730 bool success;
45fc474c1678 - Changed 'failed' parameter of try_() to 'success'. aziz parents: 213 diff changeset	1731 auto expression = try_(parseExpression(), success);
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	1732 // writefln("parseExpression()=", failed?"failed":"success");
214 45fc474c1678 - Changed 'failed' parameter of try_() to 'success'. aziz parents: 213 diff changeset	1733 if (success)
187 c977b8a78507 - Added code for parsing ExpressionStatement. aziz parents: 186 diff changeset	1734 {
c977b8a78507 - Added code for parsing ExpressionStatement. aziz parents: 186 diff changeset	1735 require(T.Semicolon);
c977b8a78507 - Added code for parsing ExpressionStatement. aziz parents: 186 diff changeset	1736 s = new ExpressionStatement(expression);
c977b8a78507 - Added code for parsing ExpressionStatement. aziz parents: 186 diff changeset	1737 }
c977b8a78507 - Added code for parsing ExpressionStatement. aziz parents: 186 diff changeset	1738 else
c977b8a78507 - Added code for parsing ExpressionStatement. aziz parents: 186 diff changeset	1739 {
216 984d48932bce - Added class EmptyStatement. aziz parents: 214 diff changeset	1740 error(MID.ExpectedButFound, "Statement", token.srcText);
250 1b9494591ad6 - Changed type of member tok to Token. aziz* parents: 249 diff changeset	1741 s = new IllegalStatement(token);
206 f9f5c0949a06 - Added method start(). aziz parents: 205 diff changeset	1742 nT();
187 c977b8a78507 - Added code for parsing ExpressionStatement. aziz parents: 186 diff changeset	1743 }
161 82c5cfc7d6d3 - Started implementation of parsing statements. aziz parents: 160 diff changeset	1744 }
205 e5a4f88982d1 - Added assert at the end of parseStatement(). aziz parents: 204 diff changeset	1745 assert(s !is null);
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	1746 // writef("§%s§", s.classinfo.name);
261 966756c5d5d3 - Added begin variables and calls to set(). aziz parents: 260 diff changeset	1747 set(s, begin);
161 82c5cfc7d6d3 - Started implementation of parsing statements. aziz parents: 160 diff changeset	1748 return s;
82c5cfc7d6d3 - Started implementation of parsing statements. aziz parents: 160 diff changeset	1749 }
82c5cfc7d6d3 - Started implementation of parsing statements. aziz parents: 160 diff changeset	1750
162 c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	1751 /+
c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	1752 ScopeStatement:
219 0d14a09227a4 - Simplified parseScopeStatement(). aziz parents: 218 diff changeset	1753 NoScopeStatement
162 c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	1754 +/
164 8ec99326752b - Implemented parseWhileStatement(). aziz parents: 163 diff changeset	1755 Statement parseScopeStatement()
162 c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	1756 {
219 0d14a09227a4 - Simplified parseScopeStatement(). aziz parents: 218 diff changeset	1757 return new ScopeStatement(parseNoScopeStatement());
162 c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	1758 }
c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	1759
166 56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1760 /+
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1761 NoScopeStatement:
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1762 NonEmptyStatement
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1763 BlockStatement
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1764 BlockStatement:
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1765 { }
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1766 { StatementList }
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1767 +/
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1768 Statement parseNoScopeStatement()
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1769 {
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1770 Statement s;
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1771 if (token.type == T.LBrace)
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1772 {
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1773 nT();
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1774 auto ss = new Statements();
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1775 while (token.type != T.RBrace && token.type != T.EOF)
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1776 ss ~= parseStatement();
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1777 require(T.RBrace);
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1778 s = ss;
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1779 }
219 0d14a09227a4 - Simplified parseScopeStatement(). aziz parents: 218 diff changeset	1780 else if (token.type == T.Semicolon)
0d14a09227a4 - Simplified parseScopeStatement(). aziz parents: 218 diff changeset	1781 {
0d14a09227a4 - Simplified parseScopeStatement(). aziz parents: 218 diff changeset	1782 error(MID.ExpectedButFound, "non-empty statement", ";");
0d14a09227a4 - Simplified parseScopeStatement(). aziz parents: 218 diff changeset	1783 s = new EmptyStatement();
0d14a09227a4 - Simplified parseScopeStatement(). aziz parents: 218 diff changeset	1784 nT();
0d14a09227a4 - Simplified parseScopeStatement(). aziz parents: 218 diff changeset	1785 }
166 56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1786 else
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1787 s = parseStatement();
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1788 return s;
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1789 }
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1790
234 5c1111dc8670 - Added method parseNoScopeOrEmptyStatement(). aziz parents: 233 diff changeset	1791 /+
5c1111dc8670 - Added method parseNoScopeOrEmptyStatement(). aziz parents: 233 diff changeset	1792 NoScopeOrEmptyStatement:
5c1111dc8670 - Added method parseNoScopeOrEmptyStatement(). aziz parents: 233 diff changeset	1793 ;
5c1111dc8670 - Added method parseNoScopeOrEmptyStatement(). aziz parents: 233 diff changeset	1794 NoScopeStatement
5c1111dc8670 - Added method parseNoScopeOrEmptyStatement(). aziz parents: 233 diff changeset	1795 +/
5c1111dc8670 - Added method parseNoScopeOrEmptyStatement(). aziz parents: 233 diff changeset	1796 Statement parseNoScopeOrEmptyStatement()
5c1111dc8670 - Added method parseNoScopeOrEmptyStatement(). aziz parents: 233 diff changeset	1797 {
5c1111dc8670 - Added method parseNoScopeOrEmptyStatement(). aziz parents: 233 diff changeset	1798 if (token.type == T.Semicolon)
312 fa0b6f32c1ae - Added Special to enum TOK. aziz parents: 305 diff changeset	1799 {
234 5c1111dc8670 - Added method parseNoScopeOrEmptyStatement(). aziz parents: 233 diff changeset	1800 nT();
312 fa0b6f32c1ae - Added Special to enum TOK. aziz parents: 305 diff changeset	1801 return new EmptyStatement();
fa0b6f32c1ae - Added Special to enum TOK. aziz parents: 305 diff changeset	1802 }
234 5c1111dc8670 - Added method parseNoScopeOrEmptyStatement(). aziz parents: 233 diff changeset	1803 else
5c1111dc8670 - Added method parseNoScopeOrEmptyStatement(). aziz parents: 233 diff changeset	1804 return parseNoScopeStatement();
5c1111dc8670 - Added method parseNoScopeOrEmptyStatement(). aziz parents: 233 diff changeset	1805 }
5c1111dc8670 - Added method parseNoScopeOrEmptyStatement(). aziz parents: 233 diff changeset	1806
201 70715b9e2109 - Implemented parseAttributeStatement(). aziz parents: 200 diff changeset	1807 Statement parseAttributeStatement()
70715b9e2109 - Implemented parseAttributeStatement(). aziz parents: 200 diff changeset	1808 {
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1809 StorageClass stc, tmp;
359 511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	1810 Linkage.Category link_cat;
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1811
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1812 void addStorageClass()
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1813 {
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1814 if (stc & tmp)
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1815 {
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1816 error(MID.RedundantStorageClass, token.srcText);
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1817 }
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1818 else
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1819 stc \|= tmp;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1820 }
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1821
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1822 Statement parse()
201 70715b9e2109 - Implemented parseAttributeStatement(). aziz parents: 200 diff changeset	1823 {
261 966756c5d5d3 - Added begin variables and calls to set(). aziz parents: 260 diff changeset	1824 auto begin = token;
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1825 Statement s;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1826 switch (token.type)
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1827 {
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1828 case T.Extern:
359 511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	1829 stc \|= StorageClass.Extern;
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1830 nT();
359 511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	1831 Linkage linkage = parseLinkage();
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	1832
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	1833 // Check for redundancy.
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	1834 Linkage.Category link_cat_tmp = Linkage.getCategory(linkage);
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	1835 if (link_cat & link_cat_tmp)
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1836 {
359 511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	1837 char[] srcText = begin.srcText;
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	1838 if (link_cat_tmp == Linkage.Category.MangleSymbol)
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	1839 srcText = begin.start[0 .. prevToken.end - begin.start];
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	1840 error(MID.RedundantStorageClass, srcText);
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1841 }
359 511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	1842 else
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	1843 link_cat \|= link_cat_tmp;
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	1844
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1845 s = new ExternStatement(linkage, parse());
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1846 break;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1847 case T.Static:
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1848 tmp = StorageClass.Static;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1849 goto Lcommon;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1850 case T.Final:
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1851 tmp = StorageClass.Final;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1852 goto Lcommon;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1853 case T.Const:
270 764eccdf619d - Fix in parseAttributeStatement(): added checks for T.LParen after const/invariant. aziz parents: 269 diff changeset	1854 version(D2)
764eccdf619d - Fix in parseAttributeStatement(): added checks for T.LParen after const/invariant. aziz parents: 269 diff changeset	1855 {
764eccdf619d - Fix in parseAttributeStatement(): added checks for T.LParen after const/invariant. aziz parents: 269 diff changeset	1856 if (peekNext() == T.LParen)
764eccdf619d - Fix in parseAttributeStatement(): added checks for T.LParen after const/invariant. aziz parents: 269 diff changeset	1857 goto case_Declaration;
764eccdf619d - Fix in parseAttributeStatement(): added checks for T.LParen after const/invariant. aziz parents: 269 diff changeset	1858 }
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1859 tmp = StorageClass.Const;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1860 goto Lcommon;
270 764eccdf619d - Fix in parseAttributeStatement(): added checks for T.LParen after const/invariant. aziz parents: 269 diff changeset	1861 version(D2)
764eccdf619d - Fix in parseAttributeStatement(): added checks for T.LParen after const/invariant. aziz parents: 269 diff changeset	1862 {
764eccdf619d - Fix in parseAttributeStatement(): added checks for T.LParen after const/invariant. aziz parents: 269 diff changeset	1863 case T.Invariant: // D 2.0
764eccdf619d - Fix in parseAttributeStatement(): added checks for T.LParen after const/invariant. aziz parents: 269 diff changeset	1864 if (peekNext() == T.LParen)
764eccdf619d - Fix in parseAttributeStatement(): added checks for T.LParen after const/invariant. aziz parents: 269 diff changeset	1865 goto case_Declaration;
764eccdf619d - Fix in parseAttributeStatement(): added checks for T.LParen after const/invariant. aziz parents: 269 diff changeset	1866 tmp = StorageClass.Invariant;
764eccdf619d - Fix in parseAttributeStatement(): added checks for T.LParen after const/invariant. aziz parents: 269 diff changeset	1867 goto Lcommon;
764eccdf619d - Fix in parseAttributeStatement(): added checks for T.LParen after const/invariant. aziz parents: 269 diff changeset	1868 }
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1869 case T.Auto:
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1870 tmp = StorageClass.Auto;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1871 goto Lcommon;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1872 case T.Scope:
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1873 tmp = StorageClass.Scope;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1874 goto Lcommon;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1875 Lcommon:
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1876 addStorageClass();
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	1877 auto tok = token.type;
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1878 nT();
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	1879 s = new AttributeStatement(tok, parse());
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1880 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	1881 // 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	1882 //case T.Class:
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1883 default:
270 764eccdf619d - Fix in parseAttributeStatement(): added checks for T.LParen after const/invariant. aziz parents: 269 diff changeset	1884 case_Declaration:
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1885 s = new DeclarationStatement(parseDeclaration(stc));
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1886 }
261 966756c5d5d3 - Added begin variables and calls to set(). aziz parents: 260 diff changeset	1887 set(s, begin);
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1888 return s;
201 70715b9e2109 - Implemented parseAttributeStatement(). aziz parents: 200 diff changeset	1889 }
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1890 return parse();
201 70715b9e2109 - Implemented parseAttributeStatement(). aziz parents: 200 diff changeset	1891 }
70715b9e2109 - Implemented parseAttributeStatement(). aziz parents: 200 diff changeset	1892
162 c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	1893 Statement parseIfStatement()
c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	1894 {
c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	1895 assert(token.type == T.If);
c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	1896 nT();
c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	1897
283 df657dd98ffa - Fix: added member type to VariableDeclaration. aziz parents: 282 diff changeset	1898 Statement variable;
162 c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	1899 Expression condition;
c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	1900 Statement ifBody, elseBody;
c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	1901
c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	1902 require(T.LParen);
283 df657dd98ffa - Fix: added member type to VariableDeclaration. aziz parents: 282 diff changeset	1903
df657dd98ffa - Fix: added member type to VariableDeclaration. aziz parents: 282 diff changeset	1904 Token* ident;
162 c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	1905 // auto Identifier = Expression
c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	1906 if (token.type == T.Auto)
c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	1907 {
c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	1908 nT();
253 4279b638c63e - Changed some string types to Token. Adapted parser accordingly. aziz* parents: 252 diff changeset	1909 ident = requireId();
162 c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	1910 require(T.Assign);
283 df657dd98ffa - Fix: added member type to VariableDeclaration. aziz parents: 282 diff changeset	1911 auto init = parseExpression();
367 dda55fae37de - ImportGraph.execute() can parse all modules depending on the imports of the root module. aziz parents: 366 diff changeset	1912 variable = new AttributeStatement(T.Auto, new DeclarationStatement(new VariableDeclaration(null, [ident], [init])));
162 c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	1913 }
c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	1914 else
c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	1915 {
c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	1916 // Declarator = Expression
237 805796880adb - Fix in parseIfStatement(): require(T.Assign) must be encompassed by a try_() call. aziz parents: 236 diff changeset	1917 Type parseDeclaratorAssign()
162 c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	1918 {
237 805796880adb - Fix in parseIfStatement(): require(T.Assign) must be encompassed by a try_() call. aziz parents: 236 diff changeset	1919 auto type = parseDeclarator(ident);
162 c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	1920 require(T.Assign);
237 805796880adb - Fix in parseIfStatement(): require(T.Assign) must be encompassed by a try_() call. aziz parents: 236 diff changeset	1921 return type;
162 c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	1922 }
237 805796880adb - Fix in parseIfStatement(): require(T.Assign) must be encompassed by a try_() call. aziz parents: 236 diff changeset	1923 bool success;
283 df657dd98ffa - Fix: added member type to VariableDeclaration. aziz parents: 282 diff changeset	1924 auto type = try_(parseDeclaratorAssign(), success);
df657dd98ffa - Fix: added member type to VariableDeclaration. aziz parents: 282 diff changeset	1925 if (success)
163 f27a98bb17c7 - Fix: when parsing Declarator fails, type and ident is set to null. aziz parents: 162 diff changeset	1926 {
283 df657dd98ffa - Fix: added member type to VariableDeclaration. aziz parents: 282 diff changeset	1927 auto init = parseExpression();
df657dd98ffa - Fix: added member type to VariableDeclaration. aziz parents: 282 diff changeset	1928 variable = new DeclarationStatement(new VariableDeclaration(type, [ident], [init]));
163 f27a98bb17c7 - Fix: when parsing Declarator fails, type and ident is set to null. aziz parents: 162 diff changeset	1929 }
283 df657dd98ffa - Fix: added member type to VariableDeclaration. aziz parents: 282 diff changeset	1930 else
df657dd98ffa - Fix: added member type to VariableDeclaration. aziz parents: 282 diff changeset	1931 condition = parseExpression();
162 c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	1932 }
c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	1933 require(T.RParen);
164 8ec99326752b - Implemented parseWhileStatement(). aziz parents: 163 diff changeset	1934 ifBody = parseScopeStatement();
162 c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	1935 if (token.type == T.Else)
c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	1936 {
c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	1937 nT();
164 8ec99326752b - Implemented parseWhileStatement(). aziz parents: 163 diff changeset	1938 elseBody = parseScopeStatement();
162 c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	1939 }
283 df657dd98ffa - Fix: added member type to VariableDeclaration. aziz parents: 282 diff changeset	1940 return new IfStatement(variable, condition, ifBody, elseBody);
162 c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	1941 }
c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	1942
164 8ec99326752b - Implemented parseWhileStatement(). aziz parents: 163 diff changeset	1943 Statement parseWhileStatement()
8ec99326752b - Implemented parseWhileStatement(). aziz parents: 163 diff changeset	1944 {
8ec99326752b - Implemented parseWhileStatement(). aziz parents: 163 diff changeset	1945 assert(token.type == T.While);
8ec99326752b - Implemented parseWhileStatement(). aziz parents: 163 diff changeset	1946 nT();
166 56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1947 require(T.LParen);
164 8ec99326752b - Implemented parseWhileStatement(). aziz parents: 163 diff changeset	1948 auto condition = parseExpression();
166 56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1949 require(T.RParen);
164 8ec99326752b - Implemented parseWhileStatement(). aziz parents: 163 diff changeset	1950 return new WhileStatement(condition, parseScopeStatement());
8ec99326752b - Implemented parseWhileStatement(). aziz parents: 163 diff changeset	1951 }
8ec99326752b - Implemented parseWhileStatement(). aziz parents: 163 diff changeset	1952
165 797074d143d7 - Implemented parseDoWhileStatement(). aziz parents: 164 diff changeset	1953 Statement parseDoWhileStatement()
797074d143d7 - Implemented parseDoWhileStatement(). aziz parents: 164 diff changeset	1954 {
797074d143d7 - Implemented parseDoWhileStatement(). aziz parents: 164 diff changeset	1955 assert(token.type == T.Do);
797074d143d7 - Implemented parseDoWhileStatement(). aziz parents: 164 diff changeset	1956 nT();
797074d143d7 - Implemented parseDoWhileStatement(). aziz parents: 164 diff changeset	1957 auto doBody = parseScopeStatement();
797074d143d7 - Implemented parseDoWhileStatement(). aziz parents: 164 diff changeset	1958 require(T.While);
166 56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1959 require(T.LParen);
165 797074d143d7 - Implemented parseDoWhileStatement(). aziz parents: 164 diff changeset	1960 auto condition = parseExpression();
166 56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1961 require(T.RParen);
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1962 return new DoWhileStatement(condition, doBody);
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1963 }
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1964
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1965 Statement parseForStatement()
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1966 {
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1967 assert(token.type == T.For);
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1968 nT();
165 797074d143d7 - Implemented parseDoWhileStatement(). aziz parents: 164 diff changeset	1969 require(T.LParen);
166 56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1970
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1971 Statement init, forBody;
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1972 Expression condition, increment;
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1973
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1974 if (token.type != T.Semicolon)
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1975 init = parseNoScopeStatement();
230 8f1790d16753 - Fix: added missing call to parseDeclaratorSuffx() in parseDeclaration. aziz parents: 229 diff changeset	1976 else
8f1790d16753 - Fix: added missing call to parseDeclaratorSuffx() in parseDeclaration. aziz parents: 229 diff changeset	1977 nT(); // Skip ;
166 56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1978 if (token.type != T.Semicolon)
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1979 condition = parseExpression();
168 fbbb2434bf6b - Simplified parseForStatement(). aziz parents: 167 diff changeset	1980 require(T.Semicolon);
166 56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1981 if (token.type != T.RParen)
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1982 increment = parseExpression();
168 fbbb2434bf6b - Simplified parseForStatement(). aziz parents: 167 diff changeset	1983 require(T.RParen);
167 141b908e32b6 - Fix: forgot parsing forBody. aziz parents: 166 diff changeset	1984 forBody = parseScopeStatement();
166 56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1985 return new ForStatement(init, condition, increment, forBody);
165 797074d143d7 - Implemented parseDoWhileStatement(). aziz parents: 164 diff changeset	1986 }
797074d143d7 - Implemented parseDoWhileStatement(). aziz parents: 164 diff changeset	1987
169 4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	1988 Statement parseForeachStatement()
4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	1989 {
4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	1990 assert(token.type == T.Foreach \|\| token.type == T.Foreach_reverse);
4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	1991 TOK tok = token.type;
4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	1992 nT();
4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	1993
257 6c58366ba1eb - Fix: need to allocate Parameters. aziz parents: 256 diff changeset	1994 auto params = new Parameters;
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	1995 Expression e; // Aggregate or LwrExpression
169 4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	1996
4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	1997 require(T.LParen);
4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	1998 while (1)
4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	1999 {
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	2000 auto paramBegin = token;
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	2001 Token* stcTok;
169 4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	2002 Type type;
253 4279b638c63e - Changed some string types to Token. Adapted parser accordingly. aziz* parents: 252 diff changeset	2003 Token* ident;
169 4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	2004
4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	2005 switch (token.type)
4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	2006 {
236 e961d1b957c3 - Fix in parseForeachStatement(): added T.Inout to case T.Ref; removed break statement. aziz parents: 235 diff changeset	2007 case T.Ref, T.Inout:
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	2008 stcTok = token;
169 4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	2009 nT();
236 e961d1b957c3 - Fix in parseForeachStatement(): added T.Inout to case T.Ref; removed break statement. aziz parents: 235 diff changeset	2010 // fall through
169 4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	2011 case T.Identifier:
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	2012 auto next = peekNext();
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	2013 if (next == T.Comma \|\| next == T.Semicolon \|\| next == T.RParen)
169 4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	2014 {
253 4279b638c63e - Changed some string types to Token. Adapted parser accordingly. aziz* parents: 252 diff changeset	2015 ident = token;
169 4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	2016 nT();
4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	2017 break;
4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	2018 }
4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	2019 // fall through
4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	2020 default:
4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	2021 type = parseDeclarator(ident);
4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	2022 }
4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	2023
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	2024 params ~= set(new Parameter(stcTok, type, ident, null), paramBegin);
169 4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	2025
4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	2026 if (token.type != T.Comma)
4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	2027 break;
4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	2028 nT();
4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	2029 }
4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	2030 require(T.Semicolon);
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	2031 e = parseExpression();
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	2032 version(D2)
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	2033 { //Foreach (ForeachType; LwrExpression .. UprExpression ) ScopeStatement
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	2034 if (token.type == T.Slice)
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	2035 {
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	2036 // if (params.length != 1)
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	2037 // error(MID.XYZ); // TODO: issue error msg
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	2038 nT();
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	2039 auto upper = parseExpression();
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	2040 require(T.RParen);
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	2041 auto forBody = parseScopeStatement();
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	2042 return new ForeachRangeStatement(tok, params, e, upper, forBody);
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	2043 }
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	2044 }
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	2045 // Foreach (ForeachTypeList; Aggregate) ScopeStatement
169 4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	2046 require(T.RParen);
4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	2047 auto forBody = parseScopeStatement();
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	2048 return new ForeachStatement(tok, params, e, forBody);
169 4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	2049 }
4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	2050
170 a63696d1c474 - Implemented parseSwitchStatement(). aziz parents: 169 diff changeset	2051 Statement parseSwitchStatement()
a63696d1c474 - Implemented parseSwitchStatement(). aziz parents: 169 diff changeset	2052 {
a63696d1c474 - Implemented parseSwitchStatement(). aziz parents: 169 diff changeset	2053 assert(token.type == T.Switch);
a63696d1c474 - Implemented parseSwitchStatement(). aziz parents: 169 diff changeset	2054 nT();
a63696d1c474 - Implemented parseSwitchStatement(). aziz parents: 169 diff changeset	2055
a63696d1c474 - Implemented parseSwitchStatement(). aziz parents: 169 diff changeset	2056 require(T.LParen);
a63696d1c474 - Implemented parseSwitchStatement(). aziz parents: 169 diff changeset	2057 auto condition = parseExpression();
a63696d1c474 - Implemented parseSwitchStatement(). aziz parents: 169 diff changeset	2058 require(T.RParen);
a63696d1c474 - Implemented parseSwitchStatement(). aziz parents: 169 diff changeset	2059 auto switchBody = parseScopeStatement();
a63696d1c474 - Implemented parseSwitchStatement(). aziz parents: 169 diff changeset	2060 return new SwitchStatement(condition, switchBody);
a63696d1c474 - Implemented parseSwitchStatement(). aziz parents: 169 diff changeset	2061 }
a63696d1c474 - Implemented parseSwitchStatement(). aziz parents: 169 diff changeset	2062
220 0c647e319b8e - Removed assert from parseStatement(). aziz parents: 219 diff changeset	2063 Statement parseCaseDefaultBody()
0c647e319b8e - Removed assert from parseStatement(). aziz parents: 219 diff changeset	2064 {
0c647e319b8e - Removed assert from parseStatement(). aziz parents: 219 diff changeset	2065 // This function is similar to parseNoScopeStatement()
224 f838a37a25bd - Fixed parseCaseDefaultBody(). aziz parents: 223 diff changeset	2066 auto s = new Statements();
f838a37a25bd - Fixed parseCaseDefaultBody(). aziz parents: 223 diff changeset	2067 while (token.type != T.Case &&
f838a37a25bd - Fixed parseCaseDefaultBody(). aziz parents: 223 diff changeset	2068 token.type != T.Default &&
f838a37a25bd - Fixed parseCaseDefaultBody(). aziz parents: 223 diff changeset	2069 token.type != T.RBrace &&
f838a37a25bd - Fixed parseCaseDefaultBody(). aziz parents: 223 diff changeset	2070 token.type != T.EOF)
f838a37a25bd - Fixed parseCaseDefaultBody(). aziz parents: 223 diff changeset	2071 s ~= parseStatement();
220 0c647e319b8e - Removed assert from parseStatement(). aziz parents: 219 diff changeset	2072 return new ScopeStatement(s);
0c647e319b8e - Removed assert from parseStatement(). aziz parents: 219 diff changeset	2073 }
0c647e319b8e - Removed assert from parseStatement(). aziz parents: 219 diff changeset	2074
171 f1fa9bbdb4cb - Implemented parseCaseStatement(). aziz parents: 170 diff changeset	2075 Statement parseCaseStatement()
f1fa9bbdb4cb - Implemented parseCaseStatement(). aziz parents: 170 diff changeset	2076 {
f1fa9bbdb4cb - Implemented parseCaseStatement(). aziz parents: 170 diff changeset	2077 assert(token.type == T.Case);
f1fa9bbdb4cb - Implemented parseCaseStatement(). aziz parents: 170 diff changeset	2078 // T.Case skipped in do-while.
f1fa9bbdb4cb - Implemented parseCaseStatement(). aziz parents: 170 diff changeset	2079 Expression[] values;
f1fa9bbdb4cb - Implemented parseCaseStatement(). aziz parents: 170 diff changeset	2080 do
f1fa9bbdb4cb - Implemented parseCaseStatement(). aziz parents: 170 diff changeset	2081 {
f1fa9bbdb4cb - Implemented parseCaseStatement(). aziz parents: 170 diff changeset	2082 nT();
f1fa9bbdb4cb - Implemented parseCaseStatement(). aziz parents: 170 diff changeset	2083 values ~= parseAssignExpression();
f1fa9bbdb4cb - Implemented parseCaseStatement(). aziz parents: 170 diff changeset	2084 } while (token.type == T.Comma)
f1fa9bbdb4cb - Implemented parseCaseStatement(). aziz parents: 170 diff changeset	2085 require(T.Colon);
f1fa9bbdb4cb - Implemented parseCaseStatement(). aziz parents: 170 diff changeset	2086
220 0c647e319b8e - Removed assert from parseStatement(). aziz parents: 219 diff changeset	2087 auto caseBody = parseCaseDefaultBody();
171 f1fa9bbdb4cb - Implemented parseCaseStatement(). aziz parents: 170 diff changeset	2088 return new CaseStatement(values, caseBody);
f1fa9bbdb4cb - Implemented parseCaseStatement(). aziz parents: 170 diff changeset	2089 }
f1fa9bbdb4cb - Implemented parseCaseStatement(). aziz parents: 170 diff changeset	2090
172 89d4519bd8a1 - Implemented parseDefaultStatement(). aziz parents: 171 diff changeset	2091 Statement parseDefaultStatement()
89d4519bd8a1 - Implemented parseDefaultStatement(). aziz parents: 171 diff changeset	2092 {
89d4519bd8a1 - Implemented parseDefaultStatement(). aziz parents: 171 diff changeset	2093 assert(token.type == T.Default);
89d4519bd8a1 - Implemented parseDefaultStatement(). aziz parents: 171 diff changeset	2094 nT();
89d4519bd8a1 - Implemented parseDefaultStatement(). aziz parents: 171 diff changeset	2095 require(T.Colon);
220 0c647e319b8e - Removed assert from parseStatement(). aziz parents: 219 diff changeset	2096 return new DefaultStatement(parseCaseDefaultBody());
172 89d4519bd8a1 - Implemented parseDefaultStatement(). aziz parents: 171 diff changeset	2097 }
89d4519bd8a1 - Implemented parseDefaultStatement(). aziz parents: 171 diff changeset	2098
173 c2714ba44350 - Implemented parseContinueStatement(). aziz parents: 172 diff changeset	2099 Statement parseContinueStatement()
c2714ba44350 - Implemented parseContinueStatement(). aziz parents: 172 diff changeset	2100 {
c2714ba44350 - Implemented parseContinueStatement(). aziz parents: 172 diff changeset	2101 assert(token.type == T.Continue);
c2714ba44350 - Implemented parseContinueStatement(). aziz parents: 172 diff changeset	2102 nT();
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	2103 Token* ident;
173 c2714ba44350 - Implemented parseContinueStatement(). aziz parents: 172 diff changeset	2104 if (token.type == T.Identifier)
c2714ba44350 - Implemented parseContinueStatement(). aziz parents: 172 diff changeset	2105 {
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	2106 ident = token;
173 c2714ba44350 - Implemented parseContinueStatement(). aziz parents: 172 diff changeset	2107 nT();
c2714ba44350 - Implemented parseContinueStatement(). aziz parents: 172 diff changeset	2108 }
c2714ba44350 - Implemented parseContinueStatement(). aziz parents: 172 diff changeset	2109 require(T.Semicolon);
c2714ba44350 - Implemented parseContinueStatement(). aziz parents: 172 diff changeset	2110 return new ContinueStatement(ident);
c2714ba44350 - Implemented parseContinueStatement(). aziz parents: 172 diff changeset	2111 }
c2714ba44350 - Implemented parseContinueStatement(). aziz parents: 172 diff changeset	2112
174 e51c9ee66ea0 - Implemented parseBreakStatement(). aziz parents: 173 diff changeset	2113 Statement parseBreakStatement()
e51c9ee66ea0 - Implemented parseBreakStatement(). aziz parents: 173 diff changeset	2114 {
e51c9ee66ea0 - Implemented parseBreakStatement(). aziz parents: 173 diff changeset	2115 assert(token.type == T.Break);
e51c9ee66ea0 - Implemented parseBreakStatement(). aziz parents: 173 diff changeset	2116 nT();
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	2117 Token* ident;
174 e51c9ee66ea0 - Implemented parseBreakStatement(). aziz parents: 173 diff changeset	2118 if (token.type == T.Identifier)
e51c9ee66ea0 - Implemented parseBreakStatement(). aziz parents: 173 diff changeset	2119 {
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	2120 ident = token;
174 e51c9ee66ea0 - Implemented parseBreakStatement(). aziz parents: 173 diff changeset	2121 nT();
e51c9ee66ea0 - Implemented parseBreakStatement(). aziz parents: 173 diff changeset	2122 }
e51c9ee66ea0 - Implemented parseBreakStatement(). aziz parents: 173 diff changeset	2123 require(T.Semicolon);
e51c9ee66ea0 - Implemented parseBreakStatement(). aziz parents: 173 diff changeset	2124 return new BreakStatement(ident);
e51c9ee66ea0 - Implemented parseBreakStatement(). aziz parents: 173 diff changeset	2125 }
e51c9ee66ea0 - Implemented parseBreakStatement(). aziz parents: 173 diff changeset	2126
175 522df6f0f230 - Implemented parseReturnStatement(). aziz parents: 174 diff changeset	2127 Statement parseReturnStatement()
522df6f0f230 - Implemented parseReturnStatement(). aziz parents: 174 diff changeset	2128 {
522df6f0f230 - Implemented parseReturnStatement(). aziz parents: 174 diff changeset	2129 assert(token.type == T.Return);
522df6f0f230 - Implemented parseReturnStatement(). aziz parents: 174 diff changeset	2130 nT();
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	2131 Expression expr;
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	2132 if (token.type != T.Semicolon)
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	2133 expr = parseExpression();
175 522df6f0f230 - Implemented parseReturnStatement(). aziz parents: 174 diff changeset	2134 require(T.Semicolon);
522df6f0f230 - Implemented parseReturnStatement(). aziz parents: 174 diff changeset	2135 return new ReturnStatement(expr);
522df6f0f230 - Implemented parseReturnStatement(). aziz parents: 174 diff changeset	2136 }
522df6f0f230 - Implemented parseReturnStatement(). aziz parents: 174 diff changeset	2137
176 3071522c0cf0 - Implemented parseGotoStatement(). aziz parents: 175 diff changeset	2138 Statement parseGotoStatement()
3071522c0cf0 - Implemented parseGotoStatement(). aziz parents: 175 diff changeset	2139 {
3071522c0cf0 - Implemented parseGotoStatement(). aziz parents: 175 diff changeset	2140 assert(token.type == T.Goto);
3071522c0cf0 - Implemented parseGotoStatement(). aziz parents: 175 diff changeset	2141 nT();
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	2142 Token* ident;
176 3071522c0cf0 - Implemented parseGotoStatement(). aziz parents: 175 diff changeset	2143 Expression caseExpr;
3071522c0cf0 - Implemented parseGotoStatement(). aziz parents: 175 diff changeset	2144 switch (token.type)
3071522c0cf0 - Implemented parseGotoStatement(). aziz parents: 175 diff changeset	2145 {
3071522c0cf0 - Implemented parseGotoStatement(). aziz parents: 175 diff changeset	2146 case T.Case:
3071522c0cf0 - Implemented parseGotoStatement(). aziz parents: 175 diff changeset	2147 nT();
3071522c0cf0 - Implemented parseGotoStatement(). aziz parents: 175 diff changeset	2148 if (token.type == T.Semicolon)
3071522c0cf0 - Implemented parseGotoStatement(). aziz parents: 175 diff changeset	2149 break;
3071522c0cf0 - Implemented parseGotoStatement(). aziz parents: 175 diff changeset	2150 caseExpr = parseExpression();
3071522c0cf0 - Implemented parseGotoStatement(). aziz parents: 175 diff changeset	2151 break;
3071522c0cf0 - Implemented parseGotoStatement(). aziz parents: 175 diff changeset	2152 case T.Default:
3071522c0cf0 - Implemented parseGotoStatement(). aziz parents: 175 diff changeset	2153 nT();
3071522c0cf0 - Implemented parseGotoStatement(). aziz parents: 175 diff changeset	2154 break;
3071522c0cf0 - Implemented parseGotoStatement(). aziz parents: 175 diff changeset	2155 default:
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	2156 ident = requireId();
176 3071522c0cf0 - Implemented parseGotoStatement(). aziz parents: 175 diff changeset	2157 }
3071522c0cf0 - Implemented parseGotoStatement(). aziz parents: 175 diff changeset	2158 require(T.Semicolon);
3071522c0cf0 - Implemented parseGotoStatement(). aziz parents: 175 diff changeset	2159 return new GotoStatement(ident, caseExpr);
3071522c0cf0 - Implemented parseGotoStatement(). aziz parents: 175 diff changeset	2160 }
3071522c0cf0 - Implemented parseGotoStatement(). aziz parents: 175 diff changeset	2161
177 504b1b2f7c93 - Implemented parseWithStatement(). aziz parents: 176 diff changeset	2162 Statement parseWithStatement()
504b1b2f7c93 - Implemented parseWithStatement(). aziz parents: 176 diff changeset	2163 {
504b1b2f7c93 - Implemented parseWithStatement(). aziz parents: 176 diff changeset	2164 assert(token.type == T.With);
504b1b2f7c93 - Implemented parseWithStatement(). aziz parents: 176 diff changeset	2165 nT();
504b1b2f7c93 - Implemented parseWithStatement(). aziz parents: 176 diff changeset	2166 require(T.LParen);
504b1b2f7c93 - Implemented parseWithStatement(). aziz parents: 176 diff changeset	2167 auto expr = parseExpression();
504b1b2f7c93 - Implemented parseWithStatement(). aziz parents: 176 diff changeset	2168 require(T.RParen);
504b1b2f7c93 - Implemented parseWithStatement(). aziz parents: 176 diff changeset	2169 return new WithStatement(expr, parseScopeStatement());
504b1b2f7c93 - Implemented parseWithStatement(). aziz parents: 176 diff changeset	2170 }
504b1b2f7c93 - Implemented parseWithStatement(). aziz parents: 176 diff changeset	2171
178 62718b29679e - Implemented parseSynchronizedStatement(). aziz parents: 177 diff changeset	2172 Statement parseSynchronizedStatement()
62718b29679e - Implemented parseSynchronizedStatement(). aziz parents: 177 diff changeset	2173 {
62718b29679e - Implemented parseSynchronizedStatement(). aziz parents: 177 diff changeset	2174 assert(token.type == T.Synchronized);
62718b29679e - Implemented parseSynchronizedStatement(). aziz parents: 177 diff changeset	2175 nT();
62718b29679e - Implemented parseSynchronizedStatement(). aziz parents: 177 diff changeset	2176 Expression expr;
62718b29679e - Implemented parseSynchronizedStatement(). aziz parents: 177 diff changeset	2177
62718b29679e - Implemented parseSynchronizedStatement(). aziz parents: 177 diff changeset	2178 if (token.type == T.LParen)
62718b29679e - Implemented parseSynchronizedStatement(). aziz parents: 177 diff changeset	2179 {
62718b29679e - Implemented parseSynchronizedStatement(). aziz parents: 177 diff changeset	2180 nT();
62718b29679e - Implemented parseSynchronizedStatement(). aziz parents: 177 diff changeset	2181 expr = parseExpression();
62718b29679e - Implemented parseSynchronizedStatement(). aziz parents: 177 diff changeset	2182 require(T.RParen);
62718b29679e - Implemented parseSynchronizedStatement(). aziz parents: 177 diff changeset	2183 }
62718b29679e - Implemented parseSynchronizedStatement(). aziz parents: 177 diff changeset	2184 return new SynchronizedStatement(expr, parseScopeStatement());
62718b29679e - Implemented parseSynchronizedStatement(). aziz parents: 177 diff changeset	2185 }
62718b29679e - Implemented parseSynchronizedStatement(). aziz parents: 177 diff changeset	2186
179 507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2187 Statement parseTryStatement()
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2188 {
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2189 assert(token.type == T.Try);
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2190 nT();
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2191
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2192 auto tryBody = parseScopeStatement();
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2193 CatchBody[] catchBodies;
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2194 FinallyBody finBody;
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2195
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2196 while (token.type == T.Catch)
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2197 {
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2198 nT();
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2199 Parameter param;
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2200 if (token.type == T.LParen)
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2201 {
229 a88967db063b - Fix: skip T.LParen in parseTryStatement(). aziz parents: 228 diff changeset	2202 nT();
253 4279b638c63e - Changed some string types to Token. Adapted parser accordingly. aziz* parents: 252 diff changeset	2203 Token* ident;
179 507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2204 auto type = parseDeclarator(ident);
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	2205 param = new Parameter(null, type, ident, null);
179 507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2206 require(T.RParen);
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2207 }
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2208 catchBodies ~= new CatchBody(param, parseNoScopeStatement());
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2209 if (param is null)
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2210 break; // This is a LastCatch
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2211 }
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2212
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2213 if (token.type == T.Finally)
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2214 {
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2215 nT();
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2216 finBody = new FinallyBody(parseNoScopeStatement());
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2217 }
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2218
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2219 if (catchBodies.length == 0 \|\| finBody is null)
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2220 {
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2221 // TODO: issue error msg.
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2222 }
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2223
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2224 return new TryStatement(tryBody, catchBodies, finBody);
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2225 }
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2226
180 d5a67aa578a8 - Implemented parseThrowStatement(). aziz parents: 179 diff changeset	2227 Statement parseThrowStatement()
d5a67aa578a8 - Implemented parseThrowStatement(). aziz parents: 179 diff changeset	2228 {
d5a67aa578a8 - Implemented parseThrowStatement(). aziz parents: 179 diff changeset	2229 assert(token.type == T.Throw);
d5a67aa578a8 - Implemented parseThrowStatement(). aziz parents: 179 diff changeset	2230 nT();
d5a67aa578a8 - Implemented parseThrowStatement(). aziz parents: 179 diff changeset	2231 auto expr = parseExpression();
d5a67aa578a8 - Implemented parseThrowStatement(). aziz parents: 179 diff changeset	2232 require(T.Semicolon);
d5a67aa578a8 - Implemented parseThrowStatement(). aziz parents: 179 diff changeset	2233 return new ThrowStatement(expr);
d5a67aa578a8 - Implemented parseThrowStatement(). aziz parents: 179 diff changeset	2234 }
d5a67aa578a8 - Implemented parseThrowStatement(). aziz parents: 179 diff changeset	2235
181 abfd51142477 - Implemented parseScopeGuardStatement(). aziz parents: 180 diff changeset	2236 Statement parseScopeGuardStatement()
abfd51142477 - Implemented parseScopeGuardStatement(). aziz parents: 180 diff changeset	2237 {
abfd51142477 - Implemented parseScopeGuardStatement(). aziz parents: 180 diff changeset	2238 assert(token.type == T.Scope);
abfd51142477 - Implemented parseScopeGuardStatement(). aziz parents: 180 diff changeset	2239 nT();
abfd51142477 - Implemented parseScopeGuardStatement(). aziz parents: 180 diff changeset	2240 assert(token.type == T.LParen);
abfd51142477 - Implemented parseScopeGuardStatement(). aziz parents: 180 diff changeset	2241 nT();
abfd51142477 - Implemented parseScopeGuardStatement(). aziz parents: 180 diff changeset	2242
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	2243 Token* condition = requireId();
50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	2244 if (condition)
50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	2245 switch (condition.identifier)
181 abfd51142477 - Implemented parseScopeGuardStatement(). aziz parents: 180 diff changeset	2246 {
abfd51142477 - Implemented parseScopeGuardStatement(). aziz parents: 180 diff changeset	2247 case "exit":
abfd51142477 - Implemented parseScopeGuardStatement(). aziz parents: 180 diff changeset	2248 case "success":
abfd51142477 - Implemented parseScopeGuardStatement(). aziz parents: 180 diff changeset	2249 case "failure":
abfd51142477 - Implemented parseScopeGuardStatement(). aziz parents: 180 diff changeset	2250 break;
abfd51142477 - Implemented parseScopeGuardStatement(). aziz parents: 180 diff changeset	2251 default:
abfd51142477 - Implemented parseScopeGuardStatement(). aziz parents: 180 diff changeset	2252 // TODO: issue error msg.
abfd51142477 - Implemented parseScopeGuardStatement(). aziz parents: 180 diff changeset	2253 }
abfd51142477 - Implemented parseScopeGuardStatement(). aziz parents: 180 diff changeset	2254 require(T.RParen);
abfd51142477 - Implemented parseScopeGuardStatement(). aziz parents: 180 diff changeset	2255 Statement scopeBody;
abfd51142477 - Implemented parseScopeGuardStatement(). aziz parents: 180 diff changeset	2256 if (token.type == T.LBrace)
abfd51142477 - Implemented parseScopeGuardStatement(). aziz parents: 180 diff changeset	2257 scopeBody = parseScopeStatement();
abfd51142477 - Implemented parseScopeGuardStatement(). aziz parents: 180 diff changeset	2258 else
abfd51142477 - Implemented parseScopeGuardStatement(). aziz parents: 180 diff changeset	2259 scopeBody = parseNoScopeStatement();
abfd51142477 - Implemented parseScopeGuardStatement(). aziz parents: 180 diff changeset	2260 return new ScopeGuardStatement(condition, scopeBody);
abfd51142477 - Implemented parseScopeGuardStatement(). aziz parents: 180 diff changeset	2261 }
abfd51142477 - Implemented parseScopeGuardStatement(). aziz parents: 180 diff changeset	2262
182 673b355ba0e9 - Implemented parseVolatileStatement(). aziz parents: 181 diff changeset	2263 Statement parseVolatileStatement()
673b355ba0e9 - Implemented parseVolatileStatement(). aziz parents: 181 diff changeset	2264 {
673b355ba0e9 - Implemented parseVolatileStatement(). aziz parents: 181 diff changeset	2265 assert(token.type == T.Volatile);
673b355ba0e9 - Implemented parseVolatileStatement(). aziz parents: 181 diff changeset	2266 nT();
673b355ba0e9 - Implemented parseVolatileStatement(). aziz parents: 181 diff changeset	2267 Statement volatileBody;
673b355ba0e9 - Implemented parseVolatileStatement(). aziz parents: 181 diff changeset	2268 if (token.type == T.Semicolon)
673b355ba0e9 - Implemented parseVolatileStatement(). aziz parents: 181 diff changeset	2269 nT();
673b355ba0e9 - Implemented parseVolatileStatement(). aziz parents: 181 diff changeset	2270 else if (token.type == T.LBrace)
673b355ba0e9 - Implemented parseVolatileStatement(). aziz parents: 181 diff changeset	2271 volatileBody = parseScopeStatement();
673b355ba0e9 - Implemented parseVolatileStatement(). aziz parents: 181 diff changeset	2272 else
219 0d14a09227a4 - Simplified parseScopeStatement(). aziz parents: 218 diff changeset	2273 volatileBody = parseStatement();
182 673b355ba0e9 - Implemented parseVolatileStatement(). aziz parents: 181 diff changeset	2274 return new VolatileStatement(volatileBody);
673b355ba0e9 - Implemented parseVolatileStatement(). aziz parents: 181 diff changeset	2275 }
673b355ba0e9 - Implemented parseVolatileStatement(). aziz parents: 181 diff changeset	2276
184 30a4c8522b09 - Implemented parsePragmaStatement(). aziz parents: 183 diff changeset	2277 Statement parsePragmaStatement()
30a4c8522b09 - Implemented parsePragmaStatement(). aziz parents: 183 diff changeset	2278 {
30a4c8522b09 - Implemented parsePragmaStatement(). aziz parents: 183 diff changeset	2279 assert(token.type == T.Pragma);
30a4c8522b09 - Implemented parsePragmaStatement(). aziz parents: 183 diff changeset	2280 nT();
30a4c8522b09 - Implemented parsePragmaStatement(). aziz parents: 183 diff changeset	2281
245 93d37f874658 - Changed type of pragma identifier to Token. aziz* parents: 244 diff changeset	2282 Token* ident;
184 30a4c8522b09 - Implemented parsePragmaStatement(). aziz parents: 183 diff changeset	2283 Expression[] args;
30a4c8522b09 - Implemented parsePragmaStatement(). aziz parents: 183 diff changeset	2284 Statement pragmaBody;
30a4c8522b09 - Implemented parsePragmaStatement(). aziz parents: 183 diff changeset	2285
30a4c8522b09 - Implemented parsePragmaStatement(). aziz parents: 183 diff changeset	2286 require(T.LParen);
245 93d37f874658 - Changed type of pragma identifier to Token. aziz* parents: 244 diff changeset	2287 ident = requireId();
184 30a4c8522b09 - Implemented parsePragmaStatement(). aziz parents: 183 diff changeset	2288
30a4c8522b09 - Implemented parsePragmaStatement(). aziz parents: 183 diff changeset	2289 if (token.type == T.Comma)
244 829fdb2e2915 - Fix: parsing at least one argument in pragma declarations/statements. aziz parents: 243 diff changeset	2290 {
829fdb2e2915 - Fix: parsing at least one argument in pragma declarations/statements. aziz parents: 243 diff changeset	2291 // Parse at least one argument.
829fdb2e2915 - Fix: parsing at least one argument in pragma declarations/statements. aziz parents: 243 diff changeset	2292 nT();
829fdb2e2915 - Fix: parsing at least one argument in pragma declarations/statements. aziz parents: 243 diff changeset	2293 args ~= parseAssignExpression();
829fdb2e2915 - Fix: parsing at least one argument in pragma declarations/statements. aziz parents: 243 diff changeset	2294 }
829fdb2e2915 - Fix: parsing at least one argument in pragma declarations/statements. aziz parents: 243 diff changeset	2295
829fdb2e2915 - Fix: parsing at least one argument in pragma declarations/statements. aziz parents: 243 diff changeset	2296 if (token.type == T.Comma)
829fdb2e2915 - Fix: parsing at least one argument in pragma declarations/statements. aziz parents: 243 diff changeset	2297 args ~= parseArguments(T.RParen);
184 30a4c8522b09 - Implemented parsePragmaStatement(). aziz parents: 183 diff changeset	2298 else
30a4c8522b09 - Implemented parsePragmaStatement(). aziz parents: 183 diff changeset	2299 require(T.RParen);
30a4c8522b09 - Implemented parsePragmaStatement(). aziz parents: 183 diff changeset	2300
234 5c1111dc8670 - Added method parseNoScopeOrEmptyStatement(). aziz parents: 233 diff changeset	2301 pragmaBody = parseNoScopeOrEmptyStatement();
184 30a4c8522b09 - Implemented parsePragmaStatement(). aziz parents: 183 diff changeset	2302
30a4c8522b09 - Implemented parsePragmaStatement(). aziz parents: 183 diff changeset	2303 return new PragmaStatement(ident, args, pragmaBody);
30a4c8522b09 - Implemented parsePragmaStatement(). aziz parents: 183 diff changeset	2304 }
30a4c8522b09 - Implemented parsePragmaStatement(). aziz parents: 183 diff changeset	2305
186 d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2306 Statement parseStaticIfStatement()
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2307 {
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2308 assert(token.type == T.Static);
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2309 nT();
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2310 assert(token.type == T.If);
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2311 nT();
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2312 Expression condition;
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2313 Statement ifBody, elseBody;
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2314
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2315 require(T.LParen);
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2316 condition = parseExpression();
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2317 require(T.RParen);
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2318 ifBody = parseNoScopeStatement();
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2319 if (token.type == T.Else)
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2320 {
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2321 nT();
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2322 elseBody = parseNoScopeStatement();
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2323 }
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2324 return new StaticIfStatement(condition, ifBody, elseBody);
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2325 }
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2326
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2327 Statement parseStaticAssertStatement()
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2328 {
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2329 assert(token.type == T.Static);
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2330 nT();
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2331 assert(token.type == T.Assert);
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2332 nT();
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2333 Expression condition, message;
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2334 require(T.LParen);
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2335 condition = parseAssignExpression();
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2336 if (token.type == T.Comma)
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2337 {
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2338 nT();
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2339 message = parseAssignExpression();
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2340 }
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2341 require(T.RParen);
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2342 require(T.Semicolon);
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2343 return new StaticAssertStatement(condition, message);
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2344 }
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2345
190 d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2346 Statement parseDebugStatement()
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2347 {
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2348 assert(token.type == T.Debug);
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2349 nT(); // Skip debug keyword.
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2350
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	2351 Token* cond; // debug ( Integer )
50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	2352 // debug ( Identifier )
190 d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2353 Statement debugBody, elseBody;
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2354
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	2355 void parseIdentOrInt(ref Token* tok)
190 d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2356 {
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2357 nT();
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	2358 if (token.type == T.Int32 \|\|
50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	2359 token.type == T.Identifier)
50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	2360 {
50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	2361 tok = token;
50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	2362 nT();
50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	2363 }
190 d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2364 else
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2365 expected(T.Identifier); // TODO: better error msg
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2366 }
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2367
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2368 // if (token.type == T.Assign)
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2369 // {
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2370 // parseIdentOrInt(identSpec, levelSpec);
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2371 // require(T.Semicolon);
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2372 // }
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2373 // else
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2374 {
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2375 // Condition:
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2376 // Integer
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2377 // Identifier
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2378
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2379 // ( Condition )
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2380 if (token.type == T.LParen)
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2381 {
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	2382 parseIdentOrInt(cond);
190 d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2383 require(T.RParen);
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2384 }
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2385
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2386 // debug Statement
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2387 // debug ( Condition ) Statement
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2388 debugBody = parseNoScopeStatement();
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2389
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2390 // else Statement
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2391 if (token.type == T.Else)
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2392 {
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2393 // debug without condition and else body makes no sense
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2394 //if (levelCond == -1 && identCond.length == 0)
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2395 // TODO: issue error msg
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2396 nT();
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2397 elseBody = parseNoScopeStatement();
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2398 }
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2399 }
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2400
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	2401 return new DebugStatement(cond, debugBody, elseBody);
190 d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2402 }
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2403
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2404 Statement parseVersionStatement()
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2405 {
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2406 assert(token.type == T.Version);
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2407
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2408 nT(); // Skip version keyword.
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2409
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	2410 Token* cond; // version ( Integer )
50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	2411 // version ( Identifier )
190 d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2412 Statement versionBody, elseBody;
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2413
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	2414 void parseIdentOrInt(ref Token* tok)
190 d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2415 {
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	2416 if (token.type == T.Int32 \|\|
50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	2417 token.type == T.Identifier)
50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	2418 {
50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	2419 tok = token;
50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	2420 nT();
50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	2421 }
190 d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2422 else
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2423 expected(T.Identifier); // TODO: better error msg
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2424 }
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2425
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2426 // if (token.type == T.Assign)
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2427 // {
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2428 // parseIdentOrInt(identSpec, levelSpec);
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2429 // require(T.Semicolon);
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2430 // }
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2431 // else
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2432 {
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2433 // Condition:
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2434 // Integer
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2435 // Identifier
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2436
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2437 // ( Condition )
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2438 require(T.LParen);
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	2439 parseIdentOrInt(cond);
190 d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2440 require(T.RParen);
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2441
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2442 // version ( Condition ) Statement
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2443 versionBody = parseNoScopeStatement();
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2444
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2445 // else Statement
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2446 if (token.type == T.Else)
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2447 {
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2448 nT();
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2449 elseBody = parseNoScopeStatement();
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2450 }
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2451 }
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2452
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	2453 return new VersionStatement(cond, versionBody, elseBody);
190 d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2454 }
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2455
161 82c5cfc7d6d3 - Started implementation of parsing statements. aziz parents: 160 diff changeset	2456 /+++++++++++++++++++++++++++++
183 c9df82f6f6be - Added parseAsmStatement() stub. aziz parents: 182 diff changeset	2457 + Assembler parsing methods +
c9df82f6f6be - Added parseAsmStatement() stub. aziz parents: 182 diff changeset	2458 +++++++++++++++++++++++++++++/
c9df82f6f6be - Added parseAsmStatement() stub. aziz parents: 182 diff changeset	2459
c9df82f6f6be - Added parseAsmStatement() stub. aziz parents: 182 diff changeset	2460 Statement parseAsmStatement()
c9df82f6f6be - Added parseAsmStatement() stub. aziz parents: 182 diff changeset	2461 {
c9df82f6f6be - Added parseAsmStatement() stub. aziz parents: 182 diff changeset	2462 assert(token.type == T.Asm);
285 104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2463 nT(); // Skip asm keyword.
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2464 require(T.LBrace);
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2465 auto ss = new Statements;
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2466 while (token.type != T.RBrace && token.type != T.EOF)
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2467 ss ~= parseAsmInstruction();
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2468 require(T.RBrace);
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2469 return new AsmStatement(ss);
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2470 }
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2471
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2472 Statement parseAsmInstruction()
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2473 {
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2474 auto begin = token;
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2475 Statement s;
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2476 switch (token.type)
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2477 {
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2478 case T.Identifier:
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2479 auto ident = token;
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2480 auto next = peekNext();
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2481 if (next == T.Colon)
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2482 {
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2483 // Identifier : AsmInstruction
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2484 nT(); // Skip Identifier
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2485 nT(); // Skip :
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2486 s = new LabeledStatement(ident, parseAsmInstruction());
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2487 break;
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2488 }
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2489
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2490 // Opcode ;
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2491 // Opcode Operands ;
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2492 // Opcode
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2493 // Identifier
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2494 Expression[] es;
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2495 if (next != T.Semicolon)
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2496 {
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2497 while (1)
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2498 {
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2499 es ~= parseAsmExpression();
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2500 if (token.type != T.Comma)
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2501 break;
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2502 nT();
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2503 }
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2504 }
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2505 require(T.Semicolon);
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2506 s = new AsmInstruction(ident, es);
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2507 break;
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2508 case T.Semicolon:
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2509 s = new EmptyStatement();
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2510 nT();
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2511 break;
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2512 default:
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2513 error(MID.ExpectedButFound, "AsmStatement", token.srcText);
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2514 s = new IllegalAsmInstruction(token);
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2515 nT();
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2516 }
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2517 set(s, begin);
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2518 return s;
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2519 }
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2520
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2521 Expression parseAsmExpression()
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2522 {
287 211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2523 auto begin = token;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2524 auto e = parseOrOrExpression();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2525 if (token.type == T.Question)
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2526 {
293 418c6548ce17 - Assigning to Node.children in several constructors that inherit from Node. aziz parents: 292 diff changeset	2527 auto tok = token;
287 211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2528 nT();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2529 auto iftrue = parseAsmExpression();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2530 require(T.Colon);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2531 auto iffalse = parseAsmExpression();
293 418c6548ce17 - Assigning to Node.children in several constructors that inherit from Node. aziz parents: 292 diff changeset	2532 e = new CondExpression(e, iftrue, iffalse, tok);
287 211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2533 set(e, begin);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2534 }
288 833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2535 // TODO: create AsmExpression that contains e?
287 211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2536 return e;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2537 }
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2538
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2539 Expression parseAsmOrOrExpression()
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2540 {
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2541 auto begin = token;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2542 alias parseAsmAndAndExpression parseNext;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2543 auto e = parseNext();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2544 while (token.type == T.OrLogical)
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2545 {
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2546 auto tok = token;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2547 nT();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2548 e = new OrOrExpression(e, parseNext(), tok);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2549 set(e, begin);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2550 }
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2551 return e;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2552 }
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2553
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2554 Expression parseAsmAndAndExpression()
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2555 {
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2556 auto begin = token;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2557 alias parseAsmOrExpression parseNext;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2558 auto e = parseNext();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2559 while (token.type == T.AndLogical)
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2560 {
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2561 auto tok = token;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2562 nT();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2563 e = new AndAndExpression(e, parseNext(), tok);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2564 set(e, begin);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2565 }
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2566 return e;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2567 }
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2568
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2569 Expression parseAsmOrExpression()
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2570 {
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2571 auto begin = token;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2572 alias parseAsmXorExpression parseNext;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2573 auto e = parseNext();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2574 while (token.type == T.OrBinary)
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2575 {
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2576 auto tok = token;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2577 nT();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2578 e = new OrExpression(e, parseNext(), tok);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2579 set(e, begin);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2580 }
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2581 return e;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2582 }
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2583
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2584 Expression parseAsmXorExpression()
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2585 {
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2586 alias parseAsmAndExpression parseNext;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2587 auto begin = token;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2588 auto e = parseNext();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2589 while (token.type == T.Xor)
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2590 {
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2591 auto tok = token;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2592 nT();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2593 e = new XorExpression(e, parseNext(), tok);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2594 set(e, begin);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2595 }
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2596 return e;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2597 }
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2598
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2599 Expression parseAsmAndExpression()
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2600 {
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2601 alias parseAsmCmpExpression parseNext;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2602 auto begin = token;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2603 auto e = parseNext();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2604 while (token.type == T.AndBinary)
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2605 {
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2606 auto tok = token;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2607 nT();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2608 e = new AndExpression(e, parseNext(), tok);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2609 set(e, begin);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2610 }
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2611 return e;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2612 }
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2613
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2614 Expression parseAsmCmpExpression()
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2615 {
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2616 alias parseAsmShiftExpression parseNext;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2617 auto begin = token;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2618 auto e = parseNext();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2619
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2620 auto operator = token;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2621 switch (operator.type)
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2622 {
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2623 case T.Equal, T.NotEqual:
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2624 nT();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2625 e = new EqualExpression(e, parseNext(), operator);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2626 break;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2627 case T.LessEqual, T.Less, T.GreaterEqual, T.Greater:
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2628 nT();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2629 e = new RelExpression(e, parseNext(), operator);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2630 break;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2631 default:
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2632 return e;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2633 }
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2634 set(e, begin);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2635 return e;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2636 }
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2637
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2638 Expression parseAsmShiftExpression()
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2639 {
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2640 alias parseAsmAddExpression parseNext;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2641 auto begin = token;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2642 auto e = parseNext();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2643 while (1)
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2644 {
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2645 auto operator = token;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2646 switch (operator.type)
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2647 {
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2648 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	2649 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	2650 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	2651 default:
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2652 return e;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2653 }
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2654 set(e, begin);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2655 }
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2656 assert(0);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2657 }
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2658
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2659 Expression parseAsmAddExpression()
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2660 {
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2661 alias parseAsmMulExpression parseNext;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2662 auto begin = token;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2663 auto e = parseNext();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2664 while (1)
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2665 {
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2666 auto operator = token;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2667 switch (operator.type)
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2668 {
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2669 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	2670 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	2671 // Not allowed in asm
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2672 //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	2673 default:
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2674 return e;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2675 }
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2676 set(e, begin);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2677 }
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2678 assert(0);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2679 }
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2680
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2681 Expression parseAsmMulExpression()
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2682 {
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2683 alias parseAsmPostExpression parseNext;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2684 auto begin = token;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2685 auto e = parseNext();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2686 while (1)
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2687 {
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2688 auto operator = token;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2689 switch (operator.type)
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2690 {
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2691 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	2692 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	2693 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	2694 default:
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2695 return e;
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 set(e, begin);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2698 }
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2699 assert(0);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2700 }
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2701
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2702 Expression parseAsmPostExpression()
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 begin = token;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2705 auto e = parseAsmUnaryExpression();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2706 while (token.type == T.RBracket)
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2707 {
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2708 nT();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2709 e = parseAsmExpression();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2710 e = new AsmPostBracketExpression(e);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2711 require(T.RBracket);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2712 set(e, begin);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2713 }
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2714 return e;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2715 }
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2716
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2717 Expression parseAsmUnaryExpression()
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 begin = token;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2720 Expression e;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2721 switch (token.type)
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2722 {
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2723 case T.Identifier:
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2724 switch (token.identifier)
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 case "near", "far", "byte", "short", "int",
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2727 "word", "dword", "float", "double", "real":
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2728 nT();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2729 if (token.type == T.Identifier && token.identifier == "ptr")
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2730 nT();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2731 else
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2732 error(MID.ExpectedButFound, "ptr", token.srcText);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2733 e = new AsmTypeExpression(parseAsmUnaryExpression());
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2734 break;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2735 case "offset":
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2736 nT();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2737 e = new AsmOffsetExpression(parseAsmUnaryExpression());
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2738 break;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2739 case "seg":
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2740 nT();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2741 e = new AsmSegExpression(parseAsmUnaryExpression());
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2742 break;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2743 default:
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2744 }
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2745 goto default;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2746 case T.Minus:
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2747 case T.Plus:
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2748 nT();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2749 e = new SignExpression(parseAsmUnaryExpression());
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2750 break;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2751 case T.Not:
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2752 nT();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2753 e = new NotExpression(parseAsmUnaryExpression());
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2754 break;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2755 case T.Tilde:
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2756 nT();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2757 e = new CompExpression(parseAsmUnaryExpression());
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2758 default:
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2759 e = parseAsmPrimaryExpression();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2760 return e;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2761 }
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2762 set(e, begin);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2763 return e;
183 c9df82f6f6be - Added parseAsmStatement() stub. aziz parents: 182 diff changeset	2764 }
c9df82f6f6be - Added parseAsmStatement() stub. aziz parents: 182 diff changeset	2765
285 104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2766 Expression parseAsmPrimaryExpression()
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2767 {
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2768 auto begin = token;
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2769 Expression e;
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2770 switch (token.type)
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2771 {
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2772 case T.Int32, T.Int64, T.Uint32, T.Uint64:
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2773 e = new IntNumberExpression(token.type, token.ulong_);
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2774 nT();
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2775 break;
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2776 case T.Float32, T.Float64, T.Float80,
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2777 T.Imaginary32, T.Imaginary64, T.Imaginary80:
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2778 e = new RealNumberExpression(token.type, token.real_);
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2779 nT();
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2780 break;
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2781 case T.Dollar:
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2782 e = new DollarExpression();
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2783 nT();
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2784 break;
287 211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2785 case T.LBracket:
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2786 // [ AsmExpression ]
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2787 nT();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2788 e = parseAsmExpression();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2789 require(T.RBracket);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2790 e = new AsmBracketExpression(e);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2791 break;
288 833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2792 case T.Identifier:
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2793 switch (token.identifier)
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2794 {
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2795 // __LOCAL_SIZE
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2796 case "__LOCAL_SIZE":
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2797 e = new AsmLocalSizeExpression();
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2798 nT();
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2799 break;
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2800 // Register
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2801 case "ST":
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2802 auto register = token;
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2803 nT();
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2804 // (1) - (7)
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2805 Token* number;
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2806 if (token.type == T.LParen)
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2807 {
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2808 nT();
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2809 if (token.type == T.Int32)
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2810 {
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2811 number = token;
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2812 nT();
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2813 }
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2814 else
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2815 expected(T.Int32);
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2816 require(T.RParen);
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2817 }
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2818 e = new AsmRegisterExpression(register, number);
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2819 break;
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2820 case "AL", "AH", "AX", "EAX",
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2821 "BL", "BH", "BX", "EBX",
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2822 "CL", "CH", "CX", "ECX",
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2823 "DL", "DH", "DX", "EDX",
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2824 "BP", "EBP",
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2825 "SP", "ESP",
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2826 "DI", "EDI",
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2827 "SI", "ESI",
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2828 "ES", "CS", "SS", "DS", "GS", "FS",
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2829 "CR0", "CR2", "CR3", "CR4",
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2830 "DR0", "DR1", "DR2", "DR3", "DR6", "DR7",
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2831 "TR3", "TR4", "TR5", "TR6", "TR7",
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2832 "MM0", "MM1", "MM2", "MM3", "MM4", "MM5", "MM6", "MM7",
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2833 "XMM0", "XMM1", "XMM2", "XMM3", "XMM4", "XMM5", "XMM6", "XMM7":
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2834 e = new AsmRegisterExpression(token);
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2835 nT();
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2836 break;
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2837 default:
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2838 // DotIdentifier
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2839 auto begin2 = token;
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2840 Expression[] identList;
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2841 goto LenterLoop;
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2842 while (token.type == T.Dot)
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2843 {
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2844 nT();
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2845 begin2 = token;
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2846 auto ident = requireId();
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2847 LenterLoop:
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2848 e = new IdentifierExpression(token);
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2849 nT();
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2850 set(e, begin2);
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2851 identList ~= e;
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2852 }
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2853 e = new DotListExpression(identList);
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2854 }
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2855 break;
285 104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2856 default:
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2857 error(MID.ExpectedButFound, "Expression", token.srcText);
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2858 e = new EmptyExpression();
287 211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2859 break;
285 104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2860 }
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2861 set(e, begin);
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2862 return e;
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2863 }
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2864
183 c9df82f6f6be - Added parseAsmStatement() stub. aziz parents: 182 diff changeset	2865 /+++++++++++++++++++++++++++++
102 6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	2866 + Expression parsing methods +
6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	2867 +++++++++++++++++++++++++++++/
6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	2868
72 f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	2869 Expression parseExpression()
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	2870 {
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	2871 auto begin = token;
72 f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	2872 auto e = parseAssignExpression();
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	2873 while (token.type == T.Comma)
235 3384ac8878f7 - Fixed parseExpression(). Forgot to skip T.Comma. aziz parents: 234 diff changeset	2874 {
251 67a798459532 - Added parameter Token* tok to some Expression constructors. Adapted parser accordingly. aziz parents: 250 diff changeset	2875 auto comma = token;
235 3384ac8878f7 - Fixed parseExpression(). Forgot to skip T.Comma. aziz parents: 234 diff changeset	2876 nT();
251 67a798459532 - Added parameter Token* tok to some Expression constructors. Adapted parser accordingly. aziz parents: 250 diff changeset	2877 e = new CommaExpression(e, parseAssignExpression(), comma);
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	2878 set(e, begin);
235 3384ac8878f7 - Fixed parseExpression(). Forgot to skip T.Comma. aziz parents: 234 diff changeset	2879 }
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	2880 // if (!trying)
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	2881 // writef("§%s§", e.classinfo.name);
72 f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	2882 return e;
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	2883 }
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	2884
71 b3777cca323c - Added Identity and NotIdentity tokens. aziz parents: 70 diff changeset	2885 Expression parseAssignExpression()
b3777cca323c - Added Identity and NotIdentity tokens. aziz parents: 70 diff changeset	2886 {
319 83f1f9a4f248 - Removed assigment to 'begin' from loop. Initializing 'begin' at decl point. aziz parents: 318 diff changeset	2887 auto begin = token;
71 b3777cca323c - Added Identity and NotIdentity tokens. aziz parents: 70 diff changeset	2888 auto e = parseCondExpression();
72 f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	2889 while (1)
71 b3777cca323c - Added Identity and NotIdentity tokens. aziz parents: 70 diff changeset	2890 {
87 c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	2891 switch (token.type)
72 f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	2892 {
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	2893 case T.Assign:
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	2894 nT(); e = new AssignExpression(e, parseAssignExpression());
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	2895 break;
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	2896 case T.LShiftAssign:
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	2897 nT(); e = new LShiftAssignExpression(e, parseAssignExpression());
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	2898 break;
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	2899 case T.RShiftAssign:
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	2900 nT(); e = new RShiftAssignExpression(e, parseAssignExpression());
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	2901 break;
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	2902 case T.URShiftAssign:
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	2903 nT(); e = new URShiftAssignExpression(e, parseAssignExpression());
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	2904 break;
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	2905 case T.OrAssign:
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	2906 nT(); e = new OrAssignExpression(e, parseAssignExpression());
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	2907 break;
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	2908 case T.AndAssign:
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	2909 nT(); e = new AndAssignExpression(e, parseAssignExpression());
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	2910 break;
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	2911 case T.PlusAssign:
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	2912 nT(); e = new PlusAssignExpression(e, parseAssignExpression());
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	2913 break;
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	2914 case T.MinusAssign:
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	2915 nT(); e = new MinusAssignExpression(e, parseAssignExpression());
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	2916 break;
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	2917 case T.DivAssign:
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	2918 nT(); e = new DivAssignExpression(e, parseAssignExpression());
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	2919 break;
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	2920 case T.MulAssign:
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	2921 nT(); e = new MulAssignExpression(e, parseAssignExpression());
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	2922 break;
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	2923 case T.ModAssign:
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	2924 nT(); e = new ModAssignExpression(e, parseAssignExpression());
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	2925 break;
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	2926 case T.XorAssign:
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	2927 nT(); e = new XorAssignExpression(e, parseAssignExpression());
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	2928 break;
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	2929 case T.CatAssign:
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	2930 nT(); e = new CatAssignExpression(e, parseAssignExpression());
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	2931 break;
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	2932 default:
218 6c0d274e0f3f - Removed goto from parseAssignExpression(). aziz parents: 217 diff changeset	2933 return e;
72 f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	2934 }
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	2935 set(e, begin);
71 b3777cca323c - Added Identity and NotIdentity tokens. aziz parents: 70 diff changeset	2936 }
b3777cca323c - Added Identity and NotIdentity tokens. aziz parents: 70 diff changeset	2937 return e;
b3777cca323c - Added Identity and NotIdentity tokens. aziz parents: 70 diff changeset	2938 }
72 f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	2939
71 b3777cca323c - Added Identity and NotIdentity tokens. aziz parents: 70 diff changeset	2940 Expression parseCondExpression()
b3777cca323c - Added Identity and NotIdentity tokens. aziz parents: 70 diff changeset	2941 {
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	2942 auto begin = token;
72 f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	2943 auto e = parseOrOrExpression();
87 c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	2944 if (token.type == T.Question)
72 f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	2945 {
293 418c6548ce17 - Assigning to Node.children in several constructors that inherit from Node. aziz parents: 292 diff changeset	2946 auto tok = token;
72 f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	2947 nT();
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	2948 auto iftrue = parseExpression();
87 c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	2949 require(T.Colon);
72 f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	2950 auto iffalse = parseCondExpression();
293 418c6548ce17 - Assigning to Node.children in several constructors that inherit from Node. aziz parents: 292 diff changeset	2951 e = new CondExpression(e, iftrue, iffalse, tok);
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	2952 set(e, begin);
72 f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	2953 }
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	2954 return e;
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	2955 }
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	2956
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	2957 Expression parseOrOrExpression()
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	2958 {
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	2959 auto begin = token;
73 11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	2960 alias parseAndAndExpression parseNext;
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	2961 auto e = parseNext();
223 043722eed46e - Fix: if-statements should be while-statements. aziz parents: 222 diff changeset	2962 while (token.type == T.OrLogical)
73 11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	2963 {
251 67a798459532 - Added parameter Token* tok to some Expression constructors. Adapted parser accordingly. aziz parents: 250 diff changeset	2964 auto tok = token;
73 11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	2965 nT();
251 67a798459532 - Added parameter Token* tok to some Expression constructors. Adapted parser accordingly. aziz parents: 250 diff changeset	2966 e = new OrOrExpression(e, parseNext(), tok);
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	2967 set(e, begin);
73 11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	2968 }
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	2969 return e;
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	2970 }
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	2971
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	2972 Expression parseAndAndExpression()
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	2973 {
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	2974 auto begin = token;
73 11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	2975 alias parseOrExpression parseNext;
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	2976 auto e = parseNext();
223 043722eed46e - Fix: if-statements should be while-statements. aziz parents: 222 diff changeset	2977 while (token.type == T.AndLogical)
73 11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	2978 {
251 67a798459532 - Added parameter Token* tok to some Expression constructors. Adapted parser accordingly. aziz parents: 250 diff changeset	2979 auto tok = token;
73 11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	2980 nT();
251 67a798459532 - Added parameter Token* tok to some Expression constructors. Adapted parser accordingly. aziz parents: 250 diff changeset	2981 e = new AndAndExpression(e, parseNext(), tok);
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	2982 set(e, begin);
73 11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	2983 }
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	2984 return e;
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	2985 }
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	2986
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	2987 Expression parseOrExpression()
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	2988 {
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	2989 auto begin = token;
73 11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	2990 alias parseXorExpression parseNext;
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	2991 auto e = parseNext();
223 043722eed46e - Fix: if-statements should be while-statements. aziz parents: 222 diff changeset	2992 while (token.type == T.OrBinary)
73 11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	2993 {
251 67a798459532 - Added parameter Token* tok to some Expression constructors. Adapted parser accordingly. aziz parents: 250 diff changeset	2994 auto tok = token;
73 11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	2995 nT();
251 67a798459532 - Added parameter Token* tok to some Expression constructors. Adapted parser accordingly. aziz parents: 250 diff changeset	2996 e = new OrExpression(e, parseNext(), tok);
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	2997 set(e, begin);
73 11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	2998 }
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	2999 return e;
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3000 }
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3001
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3002 Expression parseXorExpression()
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3003 {
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3004 auto begin = token;
73 11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3005 alias parseAndExpression parseNext;
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3006 auto e = parseNext();
223 043722eed46e - Fix: if-statements should be while-statements. aziz parents: 222 diff changeset	3007 while (token.type == T.Xor)
73 11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3008 {
251 67a798459532 - Added parameter Token* tok to some Expression constructors. Adapted parser accordingly. aziz parents: 250 diff changeset	3009 auto tok = token;
73 11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3010 nT();
251 67a798459532 - Added parameter Token* tok to some Expression constructors. Adapted parser accordingly. aziz parents: 250 diff changeset	3011 e = new XorExpression(e, parseNext(), tok);
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3012 set(e, begin);
73 11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3013 }
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3014 return e;
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3015 }
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3016
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3017 Expression parseAndExpression()
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3018 {
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3019 auto begin = token;
73 11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3020 alias parseCmpExpression parseNext;
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3021 auto e = parseNext();
223 043722eed46e - Fix: if-statements should be while-statements. aziz parents: 222 diff changeset	3022 while (token.type == T.AndBinary)
73 11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3023 {
251 67a798459532 - Added parameter Token* tok to some Expression constructors. Adapted parser accordingly. aziz parents: 250 diff changeset	3024 auto tok = token;
73 11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3025 nT();
251 67a798459532 - Added parameter Token* tok to some Expression constructors. Adapted parser accordingly. aziz parents: 250 diff changeset	3026 e = new AndExpression(e, parseNext(), tok);
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3027 set(e, begin);
73 11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3028 }
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3029 return e;
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3030 }
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3031
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3032 Expression parseCmpExpression()
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	3033 {
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3034 auto begin = token;
74 30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	3035 auto e = parseShiftExpression();
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	3036
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3037 auto operator = token;
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3038 switch (operator.type)
74 30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	3039 {
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	3040 case T.Equal, T.NotEqual:
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	3041 nT();
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	3042 e = new EqualExpression(e, parseShiftExpression(), operator);
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	3043 break;
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	3044 case T.Not:
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	3045 if (peekNext() != T.Is)
74 30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	3046 break;
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	3047 nT();
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3048 // fall through
225 8883c113c2f1 - Fix: case T.Identity should be T.Is. aziz parents: 224 diff changeset	3049 case T.Is:
74 30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	3050 nT();
83 9e6d66f647c9 - Fix: IsExpression was created instead of IdentityExpression. aziz parents: 81 diff changeset	3051 e = new IdentityExpression(e, parseShiftExpression(), operator);
74 30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	3052 break;
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	3053 case T.LessEqual, T.Less, T.GreaterEqual, T.Greater,
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	3054 T.Unordered, T.UorE, T.UorG, T.UorGorE,
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	3055 T.UorL, T.UorLorE, T.LorEorG, T.LorG:
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	3056 nT();
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	3057 e = new RelExpression(e, parseShiftExpression(), operator);
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	3058 break;
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	3059 case T.In:
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	3060 nT();
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	3061 e = new InExpression(e, parseShiftExpression(), operator);
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	3062 break;
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	3063 default:
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3064 return e;
74 30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	3065 }
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3066 set(e, begin);
74 30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	3067 return e;
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	3068 }
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	3069
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	3070 Expression parseShiftExpression()
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	3071 {
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3072 auto begin = token;
75 3f976d9e0833 - Implemented parseShiftExpression(). aziz parents: 74 diff changeset	3073 auto e = parseAddExpression();
3f976d9e0833 - Implemented parseShiftExpression(). aziz parents: 74 diff changeset	3074 while (1)
3f976d9e0833 - Implemented parseShiftExpression(). aziz parents: 74 diff changeset	3075 {
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3076 auto operator = token;
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3077 switch (operator.type)
75 3f976d9e0833 - Implemented parseShiftExpression(). aziz parents: 74 diff changeset	3078 {
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3079 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	3080 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	3081 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	3082 default:
a4c5ee9527b7 - Replaced assert(0); with break; in case T.Static. Renamed local t to next. aziz parents: 227 diff changeset	3083 return e;
75 3f976d9e0833 - Implemented parseShiftExpression(). aziz parents: 74 diff changeset	3084 }
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3085 set(e, begin);
75 3f976d9e0833 - Implemented parseShiftExpression(). aziz parents: 74 diff changeset	3086 }
228 a4c5ee9527b7 - Replaced assert(0); with break; in case T.Static. Renamed local t to next. aziz parents: 227 diff changeset	3087 assert(0);
75 3f976d9e0833 - Implemented parseShiftExpression(). aziz parents: 74 diff changeset	3088 }
3f976d9e0833 - Implemented parseShiftExpression(). aziz parents: 74 diff changeset	3089
3f976d9e0833 - Implemented parseShiftExpression(). aziz parents: 74 diff changeset	3090 Expression parseAddExpression()
3f976d9e0833 - Implemented parseShiftExpression(). aziz parents: 74 diff changeset	3091 {
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3092 auto begin = token;
76 a85f9edf6ce7 - Implemented parseAddExpression(). aziz parents: 75 diff changeset	3093 auto e = parseMulExpression();
a85f9edf6ce7 - Implemented parseAddExpression(). aziz parents: 75 diff changeset	3094 while (1)
a85f9edf6ce7 - Implemented parseAddExpression(). aziz parents: 75 diff changeset	3095 {
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3096 auto operator = token;
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3097 switch (operator.type)
76 a85f9edf6ce7 - Implemented parseAddExpression(). aziz parents: 75 diff changeset	3098 {
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3099 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	3100 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	3101 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	3102 default:
a4c5ee9527b7 - Replaced assert(0); with break; in case T.Static. Renamed local t to next. aziz parents: 227 diff changeset	3103 return e;
76 a85f9edf6ce7 - Implemented parseAddExpression(). aziz parents: 75 diff changeset	3104 }
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3105 set(e, begin);
76 a85f9edf6ce7 - Implemented parseAddExpression(). aziz parents: 75 diff changeset	3106 }
228 a4c5ee9527b7 - Replaced assert(0); with break; in case T.Static. Renamed local t to next. aziz parents: 227 diff changeset	3107 assert(0);
76 a85f9edf6ce7 - Implemented parseAddExpression(). aziz parents: 75 diff changeset	3108 }
a85f9edf6ce7 - Implemented parseAddExpression(). aziz parents: 75 diff changeset	3109
a85f9edf6ce7 - Implemented parseAddExpression(). aziz parents: 75 diff changeset	3110 Expression parseMulExpression()
a85f9edf6ce7 - Implemented parseAddExpression(). aziz parents: 75 diff changeset	3111 {
335 b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3112 alias parsePostExpression parseNext;
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3113 auto begin = token;
335 b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3114 auto e = parseNext();
77 7e21c4df1c02 - Implemented parseMulExpression(). aziz parents: 76 diff changeset	3115 while (1)
7e21c4df1c02 - Implemented parseMulExpression(). aziz parents: 76 diff changeset	3116 {
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3117 auto operator = token;
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3118 switch (operator.type)
77 7e21c4df1c02 - Implemented parseMulExpression(). aziz parents: 76 diff changeset	3119 {
335 b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3120 case T.Mul: nT(); e = new MulExpression(e, parseNext(), operator); break;
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3121 case T.Div: nT(); e = new DivExpression(e, parseNext(), operator); break;
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3122 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	3123 default:
a4c5ee9527b7 - Replaced assert(0); with break; in case T.Static. Renamed local t to next. aziz parents: 227 diff changeset	3124 return e;
77 7e21c4df1c02 - Implemented parseMulExpression(). aziz parents: 76 diff changeset	3125 }
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3126 set(e, begin);
77 7e21c4df1c02 - Implemented parseMulExpression(). aziz parents: 76 diff changeset	3127 }
228 a4c5ee9527b7 - Replaced assert(0); with break; in case T.Static. Renamed local t to next. aziz parents: 227 diff changeset	3128 assert(0);
71 b3777cca323c - Added Identity and NotIdentity tokens. aziz parents: 70 diff changeset	3129 }
b3777cca323c - Added Identity and NotIdentity tokens. aziz parents: 70 diff changeset	3130
335 b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3131 Expression parsePostExpression()
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3132 {
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3133 auto begin = token;
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3134 auto e = parseUnaryExpression();
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3135 while (1)
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3136 {
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3137 switch (token.type)
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3138 {
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3139 case T.Dot:
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3140 e = new PostDotListExpression(e, parseDotListExpression());
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3141 goto Lset;
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3142 case T.PlusPlus:
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3143 e = new PostIncrExpression(e);
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3144 break;
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3145 case T.MinusMinus:
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3146 e = new PostDecrExpression(e);
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3147 break;
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3148 case T.LParen:
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3149 e = new CallExpression(e, parseArguments(T.RParen));
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3150 goto Lset;
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3151 case T.LBracket:
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3152 // parse Slice- and IndexExpression
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3153 nT();
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3154 if (token.type == T.RBracket)
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3155 {
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3156 e = new SliceExpression(e, null, null);
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3157 break;
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3158 }
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3159
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3160 Expression[] es = [parseAssignExpression()];
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3161
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3162 if (token.type == T.Slice)
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3163 {
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3164 nT();
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3165 e = new SliceExpression(e, es[0], parseAssignExpression());
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3166 require(T.RBracket);
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3167 goto Lset;
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3168 }
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3169 else if (token.type == T.Comma)
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3170 {
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3171 es ~= parseArguments(T.RBracket);
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3172 }
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3173 else
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3174 require(T.RBracket);
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3175
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3176 e = new IndexExpression(e, es);
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3177 goto Lset;
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3178 default:
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3179 return e;
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3180 }
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3181 nT();
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3182 Lset:
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3183 set(e, begin);
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3184 }
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3185 assert(0);
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3186 }
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3187
91 ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3188 Expression parseUnaryExpression()
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3189 {
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3190 auto begin = token;
91 ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3191 Expression e;
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3192 switch (token.type)
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3193 {
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3194 case T.AndBinary:
257 6c58366ba1eb - Fix: need to allocate Parameters. aziz parents: 256 diff changeset	3195 nT();
243 461e544ebb53 - Added method requireId(). aziz parents: 242 diff changeset	3196 e = new AddressExpression(parseUnaryExpression());
91 ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3197 break;
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3198 case T.PlusPlus:
257 6c58366ba1eb - Fix: need to allocate Parameters. aziz parents: 256 diff changeset	3199 nT();
243 461e544ebb53 - Added method requireId(). aziz parents: 242 diff changeset	3200 e = new PreIncrExpression(parseUnaryExpression());
91 ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3201 break;
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3202 case T.MinusMinus:
257 6c58366ba1eb - Fix: need to allocate Parameters. aziz parents: 256 diff changeset	3203 nT();
243 461e544ebb53 - Added method requireId(). aziz parents: 242 diff changeset	3204 e = new PreDecrExpression(parseUnaryExpression());
91 ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3205 break;
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3206 case T.Mul:
257 6c58366ba1eb - Fix: need to allocate Parameters. aziz parents: 256 diff changeset	3207 nT();
243 461e544ebb53 - Added method requireId(). aziz parents: 242 diff changeset	3208 e = new DerefExpression(parseUnaryExpression());
91 ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3209 break;
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3210 case T.Minus:
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3211 case T.Plus:
257 6c58366ba1eb - Fix: need to allocate Parameters. aziz parents: 256 diff changeset	3212 nT();
243 461e544ebb53 - Added method requireId(). aziz parents: 242 diff changeset	3213 e = new SignExpression(parseUnaryExpression());
91 ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3214 break;
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3215 case T.Not:
257 6c58366ba1eb - Fix: need to allocate Parameters. aziz parents: 256 diff changeset	3216 nT();
243 461e544ebb53 - Added method requireId(). aziz parents: 242 diff changeset	3217 e = new NotExpression(parseUnaryExpression());
91 ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3218 break;
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3219 case T.Tilde:
257 6c58366ba1eb - Fix: need to allocate Parameters. aziz parents: 256 diff changeset	3220 nT();
243 461e544ebb53 - Added method requireId(). aziz parents: 242 diff changeset	3221 e = new CompExpression(parseUnaryExpression());
91 ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3222 break;
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3223 case T.New:
154 0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	3224 e = parseNewExpression();
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3225 return e;
91 ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3226 case T.Delete:
257 6c58366ba1eb - Fix: need to allocate Parameters. aziz parents: 256 diff changeset	3227 nT();
243 461e544ebb53 - Added method requireId(). aziz parents: 242 diff changeset	3228 e = new DeleteExpression(parseUnaryExpression());
91 ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3229 break;
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3230 case T.Cast:
99 6b8c248f5911 - Added member type to classes CastExpression and TypeidExpression. aziz parents: 98 diff changeset	3231 requireNext(T.LParen);
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3232 Type type;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3233 switch (token.type)
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3234 {
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3235 version(D2)
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3236 {
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3237 auto begin2 = token;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3238 case T.Const:
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3239 type = new ConstType(null);
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3240 goto case_break;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3241 case T.Invariant:
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3242 type = new InvariantType(null);
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3243 case_break:
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3244 nT();
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3245 set(type, begin2);
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3246 break;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3247 }
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3248 default:
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3249 type = parseType();
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3250 }
99 6b8c248f5911 - Added member type to classes CastExpression and TypeidExpression. aziz parents: 98 diff changeset	3251 require(T.RParen);
6b8c248f5911 - Added member type to classes CastExpression and TypeidExpression. aziz parents: 98 diff changeset	3252 e = new CastExpression(parseUnaryExpression(), type);
257 6c58366ba1eb - Fix: need to allocate Parameters. aziz parents: 256 diff changeset	3253 break;
91 ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3254 case T.LParen:
102 6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	3255 // ( Type ) . Identifier
225 8883c113c2f1 - Fix: case T.Identity should be T.Is. aziz parents: 224 diff changeset	3256 Type parseType_()
8883c113c2f1 - Fix: case T.Identity should be T.Is. aziz parents: 224 diff changeset	3257 {
8883c113c2f1 - Fix: case T.Identity should be T.Is. aziz parents: 224 diff changeset	3258 nT();
8883c113c2f1 - Fix: case T.Identity should be T.Is. aziz parents: 224 diff changeset	3259 auto type = parseType();
8883c113c2f1 - Fix: case T.Identity should be T.Is. aziz parents: 224 diff changeset	3260 require(T.RParen);
233 c2b601dcd57d - Added assert to parseDotListExpression(). aziz parents: 232 diff changeset	3261 require(T.Dot);
225 8883c113c2f1 - Fix: case T.Identity should be T.Is. aziz parents: 224 diff changeset	3262 return type;
8883c113c2f1 - Fix: case T.Identity should be T.Is. aziz parents: 224 diff changeset	3263 }
8883c113c2f1 - Fix: case T.Identity should be T.Is. aziz parents: 224 diff changeset	3264 bool success;
8883c113c2f1 - Fix: case T.Identity should be T.Is. aziz parents: 224 diff changeset	3265 auto type = try_(parseType_(), success);
8883c113c2f1 - Fix: case T.Identity should be T.Is. aziz parents: 224 diff changeset	3266 if (success)
8883c113c2f1 - Fix: case T.Identity should be T.Is. aziz parents: 224 diff changeset	3267 {
243 461e544ebb53 - Added method requireId(). aziz parents: 242 diff changeset	3268 auto ident = requireId();
225 8883c113c2f1 - Fix: case T.Identity should be T.Is. aziz parents: 224 diff changeset	3269 e = new TypeDotIdExpression(type, ident);
257 6c58366ba1eb - Fix: need to allocate Parameters. aziz parents: 256 diff changeset	3270 break;
225 8883c113c2f1 - Fix: case T.Identity should be T.Is. aziz parents: 224 diff changeset	3271 }
8883c113c2f1 - Fix: case T.Identity should be T.Is. aziz parents: 224 diff changeset	3272 goto default;
91 ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3273 default:
335 b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3274 e = parsePrimaryExpression();
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3275 return e;
91 ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3276 }
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3277 assert(e !is null);
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3278 set(e, begin);
91 ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3279 return e;
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3280 }
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3281
79 df4e5c7ad58a - Implemented most of parsePostExpression() and parsePreExpression(). aziz parents: 78 diff changeset	3282 Expression parsePrimaryExpression()
78 f043759fb59a - Added code to parseUnaryExpression(); not fully implemented. aziz parents: 77 diff changeset	3283 {
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3284 auto begin = token;
83 9e6d66f647c9 - Fix: IsExpression was created instead of IdentityExpression. aziz parents: 81 diff changeset	3285 Expression e;
87 c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	3286 switch (token.type)
83 9e6d66f647c9 - Fix: IsExpression was created instead of IdentityExpression. aziz parents: 81 diff changeset	3287 {
154 0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	3288 case T.Identifier, T.Dot, T.Typeof:
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	3289 e = parseDotListExpression();
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	3290 break;
84 ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3291 case T.This:
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3292 nT();
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3293 e = new ThisExpression();
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3294 break;
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3295 case T.Super:
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3296 nT();
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3297 e = new SuperExpression();
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3298 break;
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3299 case T.Null:
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3300 nT();
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3301 e = new NullExpression();
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3302 break;
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3303 case T.True, T.False:
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3304 nT();
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3305 e = new BoolExpression();
84 ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3306 break;
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3307 case T.Dollar:
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3308 nT();
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3309 e = new DollarExpression();
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3310 break;
97 1a83e5070a84 - Added code for parsing IntNumber- and RealNumberExpressions. aziz parents: 96 diff changeset	3311 case T.Int32, T.Int64, T.Uint32, T.Uint64:
228 a4c5ee9527b7 - Replaced assert(0); with break; in case T.Static. Renamed local t to next. aziz parents: 227 diff changeset	3312 e = new IntNumberExpression(token.type, token.ulong_);
97 1a83e5070a84 - Added code for parsing IntNumber- and RealNumberExpressions. aziz parents: 96 diff changeset	3313 nT();
1a83e5070a84 - Added code for parsing IntNumber- and RealNumberExpressions. aziz parents: 96 diff changeset	3314 break;
1a83e5070a84 - Added code for parsing IntNumber- and RealNumberExpressions. aziz parents: 96 diff changeset	3315 case T.Float32, T.Float64, T.Float80,
1a83e5070a84 - Added code for parsing IntNumber- and RealNumberExpressions. aziz parents: 96 diff changeset	3316 T.Imaginary32, T.Imaginary64, T.Imaginary80:
228 a4c5ee9527b7 - Replaced assert(0); with break; in case T.Static. Renamed local t to next. aziz parents: 227 diff changeset	3317 e = new RealNumberExpression(token.type, token.real_);
97 1a83e5070a84 - Added code for parsing IntNumber- and RealNumberExpressions. aziz parents: 96 diff changeset	3318 nT();
84 ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3319 break;
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3320 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	3321 nT();
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3322 e = new CharLiteralExpression();
84 ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3323 break;
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3324 case T.String:
157 fdbd47d72614 - Renamed class StringLiteralExpression to StringLiteralsExpression. aziz parents: 156 diff changeset	3325 Token*[] stringLiterals;
fdbd47d72614 - Renamed class StringLiteralExpression to StringLiteralsExpression. aziz parents: 156 diff changeset	3326 do
84 ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3327 {
157 fdbd47d72614 - Renamed class StringLiteralExpression to StringLiteralsExpression. aziz parents: 156 diff changeset	3328 stringLiterals ~= token;
84 ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3329 nT();
157 fdbd47d72614 - Renamed class StringLiteralExpression to StringLiteralsExpression. aziz parents: 156 diff changeset	3330 } while (token.type == T.String)
fdbd47d72614 - Renamed class StringLiteralExpression to StringLiteralsExpression. aziz parents: 156 diff changeset	3331 e = new StringLiteralsExpression(stringLiterals);
84 ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3332 break;
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3333 case T.LBracket:
85 d8dc3171440d - Fixed parsing CallExpression and IndexExpression. aziz parents: 84 diff changeset	3334 Expression[] values;
d8dc3171440d - Fixed parsing CallExpression and IndexExpression. aziz parents: 84 diff changeset	3335
d8dc3171440d - Fixed parsing CallExpression and IndexExpression. aziz parents: 84 diff changeset	3336 nT();
87 c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	3337 if (token.type != T.RBracket)
85 d8dc3171440d - Fixed parsing CallExpression and IndexExpression. aziz parents: 84 diff changeset	3338 {
d8dc3171440d - Fixed parsing CallExpression and IndexExpression. aziz parents: 84 diff changeset	3339 e = parseAssignExpression();
87 c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	3340 if (token.type == T.Colon)
85 d8dc3171440d - Fixed parsing CallExpression and IndexExpression. aziz parents: 84 diff changeset	3341 goto LparseAssocArray;
87 c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	3342 else if (token.type == T.Comma)
143 e760d7552f66 - Renamed parseArgumentList() to parseArguments(). aziz parents: 141 diff changeset	3343 values = [e] ~ parseArguments(T.RBracket);
87 c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	3344 else
c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	3345 require(T.RBracket);
85 d8dc3171440d - Fixed parsing CallExpression and IndexExpression. aziz parents: 84 diff changeset	3346 }
271 68987c1c59b6 - Fixed parsing empty ArrayLiteralExpression. Needed to skip T.RBracket. aziz parents: 270 diff changeset	3347 else
68987c1c59b6 - Fixed parsing empty ArrayLiteralExpression. Needed to skip T.RBracket. aziz parents: 270 diff changeset	3348 nT();
85 d8dc3171440d - Fixed parsing CallExpression and IndexExpression. aziz parents: 84 diff changeset	3349
d8dc3171440d - Fixed parsing CallExpression and IndexExpression. aziz parents: 84 diff changeset	3350 e = new ArrayLiteralExpression(values);
d8dc3171440d - Fixed parsing CallExpression and IndexExpression. aziz parents: 84 diff changeset	3351 break;
d8dc3171440d - Fixed parsing CallExpression and IndexExpression. aziz parents: 84 diff changeset	3352
d8dc3171440d - Fixed parsing CallExpression and IndexExpression. aziz parents: 84 diff changeset	3353 LparseAssocArray:
d8dc3171440d - Fixed parsing CallExpression and IndexExpression. aziz parents: 84 diff changeset	3354 Expression[] keys;
d8dc3171440d - Fixed parsing CallExpression and IndexExpression. aziz parents: 84 diff changeset	3355
d8dc3171440d - Fixed parsing CallExpression and IndexExpression. aziz parents: 84 diff changeset	3356 keys ~= e;
d8dc3171440d - Fixed parsing CallExpression and IndexExpression. aziz parents: 84 diff changeset	3357 nT(); // Skip colon.
271 68987c1c59b6 - Fixed parsing empty ArrayLiteralExpression. Needed to skip T.RBracket. aziz parents: 270 diff changeset	3358 goto LenterLoop;
68987c1c59b6 - Fixed parsing empty ArrayLiteralExpression. Needed to skip T.RBracket. aziz parents: 270 diff changeset	3359
68987c1c59b6 - Fixed parsing empty ArrayLiteralExpression. Needed to skip T.RBracket. aziz parents: 270 diff changeset	3360 while (1)
88 81cb24669ed3 - Fixed parser of AssocArrayLiteralExpression. aziz parents: 87 diff changeset	3361 {
271 68987c1c59b6 - Fixed parsing empty ArrayLiteralExpression. Needed to skip T.RBracket. aziz parents: 270 diff changeset	3362 keys ~= parseAssignExpression();
68987c1c59b6 - Fixed parsing empty ArrayLiteralExpression. Needed to skip T.RBracket. aziz parents: 270 diff changeset	3363 require(T.Colon);
68987c1c59b6 - Fixed parsing empty ArrayLiteralExpression. Needed to skip T.RBracket. aziz parents: 270 diff changeset	3364 LenterLoop:
68987c1c59b6 - Fixed parsing empty ArrayLiteralExpression. Needed to skip T.RBracket. aziz parents: 270 diff changeset	3365 values ~= parseAssignExpression();
68987c1c59b6 - Fixed parsing empty ArrayLiteralExpression. Needed to skip T.RBracket. aziz parents: 270 diff changeset	3366 if (token.type != T.Comma)
68987c1c59b6 - Fixed parsing empty ArrayLiteralExpression. Needed to skip T.RBracket. aziz parents: 270 diff changeset	3367 break;
68987c1c59b6 - Fixed parsing empty ArrayLiteralExpression. Needed to skip T.RBracket. aziz parents: 270 diff changeset	3368 nT();
88 81cb24669ed3 - Fixed parser of AssocArrayLiteralExpression. aziz parents: 87 diff changeset	3369 }
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3370 require(T.RBracket);
85 d8dc3171440d - Fixed parsing CallExpression and IndexExpression. aziz parents: 84 diff changeset	3371 e = new AssocArrayLiteralExpression(keys, values);
84 ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3372 break;
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3373 case T.LBrace:
193 2a2975b6d539 - Using parseFunctionBody() when parsing FunctionLiteralExpression. aziz parents: 192 diff changeset	3374 // DelegateLiteral := { Statements }
267 f3dfa6208ed3 - Removed parameter func from parseFunctionBody(). Creating new FunctionBody inside the method. aziz parents: 266 diff changeset	3375 auto funcBody = parseFunctionBody();
289 a99357783c6f - Fix: assign targs to member targs of TraitsExpression. aziz parents: 288 diff changeset	3376 e = new FunctionLiteralExpression(funcBody);
84 ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3377 break;
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3378 case T.Function, T.Delegate:
193 2a2975b6d539 - Using parseFunctionBody() when parsing FunctionLiteralExpression. aziz parents: 192 diff changeset	3379 // FunctionLiteral := (function\|delegate) Type? '(' ArgumentList ')' '{' Statements '}'
133 3924b1ee1302 - Added code for parsing function and delegate literal expressions. aziz parents: 132 diff changeset	3380 nT(); // Skip function\|delegate token.
3924b1ee1302 - Added code for parsing function and delegate literal expressions. aziz parents: 132 diff changeset	3381 Type returnType;
3924b1ee1302 - Added code for parsing function and delegate literal expressions. aziz parents: 132 diff changeset	3382 Parameters parameters;
3924b1ee1302 - Added code for parsing function and delegate literal expressions. aziz parents: 132 diff changeset	3383 if (token.type != T.LBrace)
3924b1ee1302 - Added code for parsing function and delegate literal expressions. aziz parents: 132 diff changeset	3384 {
3924b1ee1302 - Added code for parsing function and delegate literal expressions. aziz parents: 132 diff changeset	3385 if (token.type != T.LParen) // Optional return type
3924b1ee1302 - Added code for parsing function and delegate literal expressions. aziz parents: 132 diff changeset	3386 returnType = parseType();
143 e760d7552f66 - Renamed parseArgumentList() to parseArguments(). aziz parents: 141 diff changeset	3387 parameters = parseParameterList();
133 3924b1ee1302 - Added code for parsing function and delegate literal expressions. aziz parents: 132 diff changeset	3388 }
267 f3dfa6208ed3 - Removed parameter func from parseFunctionBody(). Creating new FunctionBody inside the method. aziz parents: 266 diff changeset	3389 auto funcBody = parseFunctionBody();
289 a99357783c6f - Fix: assign targs to member targs of TraitsExpression. aziz parents: 288 diff changeset	3390 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	3391 break;
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3392 case T.Assert:
86 0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	3393 Expression msg;
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	3394 requireNext(T.LParen);
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	3395 e = parseAssignExpression();
87 c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	3396 if (token.type == T.Comma)
86 0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	3397 {
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	3398 nT();
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	3399 msg = parseAssignExpression();
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	3400 }
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	3401 require(T.RParen);
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	3402 e = new AssertExpression(e, msg);
84 ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3403 break;
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3404 case T.Mixin:
86 0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	3405 requireNext(T.LParen);
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	3406 e = parseAssignExpression();
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	3407 require(T.RParen);
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	3408 e = new MixinExpression(e);
84 ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3409 break;
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3410 case T.Import:
86 0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	3411 requireNext(T.LParen);
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	3412 e = parseAssignExpression();
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	3413 require(T.RParen);
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	3414 e = new ImportExpression(e);
84 ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3415 break;
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3416 case T.Typeid:
86 0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	3417 requireNext(T.LParen);
99 6b8c248f5911 - Added member type to classes CastExpression and TypeidExpression. aziz parents: 98 diff changeset	3418 auto type = parseType();
6b8c248f5911 - Added member type to classes CastExpression and TypeidExpression. aziz parents: 98 diff changeset	3419 require(T.RParen);
6b8c248f5911 - Added member type to classes CastExpression and TypeidExpression. aziz parents: 98 diff changeset	3420 e = new TypeidExpression(type);
84 ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3421 break;
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3422 case T.Is:
100 538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	3423 requireNext(T.LParen);
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	3424
248 63a15b082c0c - Removed class SpecializationType. aziz parents: 247 diff changeset	3425 Type type, specType;
253 4279b638c63e - Changed some string types to Token. Adapted parser accordingly. aziz* parents: 252 diff changeset	3426 Token* ident; // optional Identifier
248 63a15b082c0c - Removed class SpecializationType. aziz parents: 247 diff changeset	3427 Token* opTok, specTok;
100 538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	3428
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	3429 type = parseDeclarator(ident, true);
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	3430
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	3431 switch (token.type)
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	3432 {
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	3433 case T.Colon, T.Equal:
248 63a15b082c0c - Removed class SpecializationType. aziz parents: 247 diff changeset	3434 opTok = token;
100 538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	3435 nT();
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	3436 switch (token.type)
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	3437 {
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	3438 case T.Typedef,
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	3439 T.Struct,
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	3440 T.Union,
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	3441 T.Class,
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	3442 T.Interface,
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	3443 T.Enum,
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	3444 T.Function,
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	3445 T.Delegate,
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	3446 T.Super,
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	3447 T.Return:
248 63a15b082c0c - Removed class SpecializationType. aziz parents: 247 diff changeset	3448 specTok = token;
102 6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	3449 nT();
100 538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	3450 break;
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	3451 default:
248 63a15b082c0c - Removed class SpecializationType. aziz parents: 247 diff changeset	3452 specType = parseType();
100 538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	3453 }
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	3454 default:
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	3455 }
102 6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	3456 require(T.RParen);
248 63a15b082c0c - Removed class SpecializationType. aziz parents: 247 diff changeset	3457 e = new IsExpression(type, ident, opTok, specTok, specType);
84 ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3458 break;
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3459 case T.LParen:
232 2a4e2c8ca094 - Renamed method isTemplateParameterList() to tokenAfterParenIs(). aziz parents: 231 diff changeset	3460 if (tokenAfterParenIs(T.LBrace))
130 0467f01ed524 - Fix: parameters can have optional identifier. aziz parents: 129 diff changeset	3461 {
232 2a4e2c8ca094 - Renamed method isTemplateParameterList() to tokenAfterParenIs(). aziz parents: 231 diff changeset	3462 auto parameters = parseParameterList();
143 e760d7552f66 - Renamed parseArgumentList() to parseArguments(). aziz parents: 141 diff changeset	3463 // ( ParameterList ) FunctionBody
267 f3dfa6208ed3 - Removed parameter func from parseFunctionBody(). Creating new FunctionBody inside the method. aziz parents: 266 diff changeset	3464 auto funcBody = parseFunctionBody();
289 a99357783c6f - Fix: assign targs to member targs of TraitsExpression. aziz parents: 288 diff changeset	3465 e = new FunctionLiteralExpression(null, parameters, funcBody);
130 0467f01ed524 - Fix: parameters can have optional identifier. aziz parents: 129 diff changeset	3466 }
0467f01ed524 - Fix: parameters can have optional identifier. aziz parents: 129 diff changeset	3467 else
0467f01ed524 - Fix: parameters can have optional identifier. aziz parents: 129 diff changeset	3468 {
131 ce636f3981cc - Removed TOK.Number. aziz parents: 130 diff changeset	3469 // ( Expression )
130 0467f01ed524 - Fix: parameters can have optional identifier. aziz parents: 129 diff changeset	3470 nT();
0467f01ed524 - Fix: parameters can have optional identifier. aziz parents: 129 diff changeset	3471 e = parseExpression();
0467f01ed524 - Fix: parameters can have optional identifier. aziz parents: 129 diff changeset	3472 require(T.RParen);
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3473 // TODO: create ParenExpression?
130 0467f01ed524 - Fix: parameters can have optional identifier. aziz parents: 129 diff changeset	3474 }
84 ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3475 break;
86 0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	3476 // BasicType . Identifier
192 5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	3477 case T.Char, T.Wchar, T.Dchar, T.Bool,
94 0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	3478 T.Byte, T.Ubyte, T.Short, T.Ushort,
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	3479 T.Int, T.Uint, T.Long, T.Ulong,
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	3480 T.Float, T.Double, T.Real,
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	3481 T.Ifloat, T.Idouble, T.Ireal,
192 5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	3482 T.Cfloat, T.Cdouble, T.Creal, T.Void:
280 1eb54f6f392e - Made class Type abstract. aziz parents: 272 diff changeset	3483 auto type = new IntegralType(token.type);
247 11a67ec83281 - Call set() on type variable. aziz parents: 246 diff changeset	3484 nT();
11a67ec83281 - Call set() on type variable. aziz parents: 246 diff changeset	3485 set(type, begin);
11a67ec83281 - Call set() on type variable. aziz parents: 246 diff changeset	3486 require(T.Dot);
243 461e544ebb53 - Added method requireId(). aziz parents: 242 diff changeset	3487 auto ident = requireId();
86 0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	3488
94 0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	3489 e = new TypeDotIdExpression(type, ident);
98 aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3490 break;
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3491 version(D2)
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3492 {
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3493 case T.Traits:
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3494 nT();
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3495 require(T.LParen);
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3496 auto id = requireId();
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3497 TemplateArguments args;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3498 if (token.type == T.Comma)
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3499 {
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3500 args = parseTemplateArguments2();
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3501 }
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3502 else
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3503 require(T.RParen);
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3504 e = new TraitsExpression(id, args);
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3505 break;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3506 }
84 ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3507 default:
343 95f1b6e43214 - Removed TOK.Special and added an own entry for each special token. aziz parents: 342 diff changeset	3508 if (token.isSpecialToken)
95f1b6e43214 - Removed TOK.Special and added an own entry for each special token. aziz parents: 342 diff changeset	3509 {
95f1b6e43214 - Removed TOK.Special and added an own entry for each special token. aziz parents: 342 diff changeset	3510 e = new SpecialTokenExpression(token);
95f1b6e43214 - Removed TOK.Special and added an own entry for each special token. aziz parents: 342 diff changeset	3511 nT();
95f1b6e43214 - Removed TOK.Special and added an own entry for each special token. aziz parents: 342 diff changeset	3512 break;
95f1b6e43214 - Removed TOK.Special and added an own entry for each special token. aziz parents: 342 diff changeset	3513 }
95f1b6e43214 - Removed TOK.Special and added an own entry for each special token. aziz parents: 342 diff changeset	3514
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	3515 error(MID.ExpectedButFound, "Expression", token.srcText);
136 96468715ea79 - Returning EmptyExpression in parsePrimaryExpression() when no token matched. aziz parents: 135 diff changeset	3516 e = new EmptyExpression();
83 9e6d66f647c9 - Fix: IsExpression was created instead of IdentityExpression. aziz parents: 81 diff changeset	3517 }
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3518 set(e, begin);
83 9e6d66f647c9 - Fix: IsExpression was created instead of IdentityExpression. aziz parents: 81 diff changeset	3519 return e;
77 7e21c4df1c02 - Implemented parseMulExpression(). aziz parents: 76 diff changeset	3520 }
7e21c4df1c02 - Implemented parseMulExpression(). aziz parents: 76 diff changeset	3521
154 0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	3522 Expression parseNewExpression(/Expression e/)
81 aa1ea2548dd9 - Fixed parseExpression() method. aziz parents: 80 diff changeset	3523 {
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3524 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	3525 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	3526 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	3527
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon. aziz parents: 143 diff changeset	3528 Expression[] newArguments;
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon. aziz parents: 143 diff changeset	3529 Expression[] ctorArguments;
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon. aziz parents: 143 diff changeset	3530
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon. aziz parents: 143 diff changeset	3531 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	3532 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	3533
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon. aziz parents: 143 diff changeset	3534 // NewAnonClassExpression:
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon. aziz parents: 143 diff changeset	3535 // 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	3536 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	3537 {
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon. aziz parents: 143 diff changeset	3538 nT();
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon. aziz parents: 143 diff changeset	3539 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	3540 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	3541
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon. aziz parents: 143 diff changeset	3542 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	3543
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	3544 auto decls = parseDeclarationDefinitionsBlock();
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3545 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	3546 }
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon. aziz parents: 143 diff changeset	3547
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon. aziz parents: 143 diff changeset	3548 // NewExpression:
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon. aziz parents: 143 diff changeset	3549 // NewArguments Type [ AssignExpression ]
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon. aziz parents: 143 diff changeset	3550 // NewArguments Type ( ArgumentList )
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon. aziz parents: 143 diff changeset	3551 // NewArguments Type
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon. aziz parents: 143 diff changeset	3552 auto type = parseType();
302 d04a79e795a2 - Fix in parseNewExpression(): removed check for type id. aziz parents: 301 diff changeset	3553
d04a79e795a2 - Fix in parseNewExpression(): removed check for type id. aziz parents: 301 diff changeset	3554 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	3555 ctorArguments = parseArguments(T.RParen);
302 d04a79e795a2 - Fix in parseNewExpression(): removed check for type id. aziz parents: 301 diff changeset	3556
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3557 return set(new NewExpression(/e, /newArguments, type, ctorArguments), begin);
81 aa1ea2548dd9 - Fixed parseExpression() method. aziz parents: 80 diff changeset	3558 }
aa1ea2548dd9 - Fixed parseExpression() method. aziz parents: 80 diff changeset	3559
98 aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3560 Type parseType()
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3561 {
104 b535016f8c3f - DeclaratorSuffix must be parsed after an Identifier. aziz parents: 103 diff changeset	3562 return parseBasicType2(parseBasicType());
98 aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3563 }
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3564
94 0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	3565 Type parseBasicType()
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	3566 {
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3567 auto begin = token;
94 0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	3568 Type t;
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	3569 // IdentifierType tident;
94 0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	3570
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	3571 switch (token.type)
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	3572 {
192 5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	3573 case T.Char, T.Wchar, T.Dchar, T.Bool,
94 0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	3574 T.Byte, T.Ubyte, T.Short, T.Ushort,
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	3575 T.Int, T.Uint, T.Long, T.Ulong,
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	3576 T.Float, T.Double, T.Real,
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	3577 T.Ifloat, T.Idouble, T.Ireal,
192 5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	3578 T.Cfloat, T.Cdouble, T.Creal, T.Void:
280 1eb54f6f392e - Made class Type abstract. aziz parents: 272 diff changeset	3579 t = new IntegralType(token.type);
94 0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	3580 nT();
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3581 set(t, begin);
94 0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	3582 break;
153 66790fc2c0a2 - Added method parseIdentifierListType(). aziz parents: 152 diff changeset	3583 case T.Identifier, T.Typeof, T.Dot:
154 0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	3584 t = parseDotListType();
153 66790fc2c0a2 - Added method parseIdentifierListType(). aziz parents: 152 diff changeset	3585 break;
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3586 version(D2)
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3587 {
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3588 case T.Const:
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3589 // const ( Type )
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3590 nT();
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3591 require(T.LParen);
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3592 t = parseType();
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3593 require(T.RParen);
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3594 t = new ConstType(t);
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3595 set(t, begin);
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3596 break;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3597 case T.Invariant:
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3598 // invariant ( Type )
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3599 nT();
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3600 require(T.LParen);
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3601 t = parseType();
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3602 require(T.RParen);
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3603 t = new InvariantType(t);
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3604 set(t, begin);
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3605 break;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3606 }
94 0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	3607 default:
136 96468715ea79 - Returning EmptyExpression in parsePrimaryExpression() when no token matched. aziz parents: 135 diff changeset	3608 // TODO: issue error msg.
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	3609 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	3610 t = new UndefinedType();
259 8118da6fee44 - Moved nT() below statement where an attribute class is constructed. aziz parents: 258 diff changeset	3611 nT();
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3612 set(t, begin);
94 0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	3613 }
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	3614 return t;
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	3615 }
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	3616
95 0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	3617 Type parseBasicType2(Type t)
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	3618 {
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3619 typeof(token) begin;
95 0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	3620 while (1)
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	3621 {
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3622 begin = token;
95 0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	3623 switch (token.type)
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	3624 {
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	3625 case T.Mul:
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	3626 t = new PointerType(t);
98 aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3627 nT();
95 0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	3628 break;
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	3629 case T.LBracket:
106 441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	3630 t = parseArrayType(t);
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3631 continue;
98 aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3632 case T.Function, T.Delegate:
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3633 TOK tok = token.type;
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3634 nT();
143 e760d7552f66 - Renamed parseArgumentList() to parseArguments(). aziz parents: 141 diff changeset	3635 auto parameters = parseParameterList();
135 145e0d68ec95 - Added enum TID to module Type. aziz parents: 134 diff changeset	3636 if (tok == T.Function)
291 c0e857931ff6 - Changed FunctionType and DelegateType. Both receive return type and parameters. aziz parents: 290 diff changeset	3637 t = new FunctionType(t, parameters);
135 145e0d68ec95 - Added enum TID to module Type. aziz parents: 134 diff changeset	3638 else
291 c0e857931ff6 - Changed FunctionType and DelegateType. Both receive return type and parameters. aziz parents: 290 diff changeset	3639 t = new DelegateType(t, parameters);
98 aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3640 break;
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3641 default:
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3642 return t;
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3643 }
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3644 set(t, begin);
98 aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3645 }
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3646 assert(0);
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3647 }
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3648
232 2a4e2c8ca094 - Renamed method isTemplateParameterList() to tokenAfterParenIs(). aziz parents: 231 diff changeset	3649 bool tokenAfterParenIs(TOK tok)
196 ea3f66901fa4 - Added code for parsing template parameter lists for functions. aziz parents: 195 diff changeset	3650 {
ea3f66901fa4 - Added code for parsing template parameter lists for functions. aziz parents: 195 diff changeset	3651 // 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	3652 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	3653 Token* next = token;
196 ea3f66901fa4 - Added code for parsing template parameter lists for functions. aziz parents: 195 diff changeset	3654 uint level = 1;
ea3f66901fa4 - Added code for parsing template parameter lists for functions. aziz parents: 195 diff changeset	3655 while (1)
ea3f66901fa4 - Added code for parsing template parameter lists for functions. aziz parents: 195 diff changeset	3656 {
232 2a4e2c8ca094 - Renamed method isTemplateParameterList() to tokenAfterParenIs(). aziz parents: 231 diff changeset	3657 lx.peek(next);
2a4e2c8ca094 - Renamed method isTemplateParameterList() to tokenAfterParenIs(). aziz parents: 231 diff changeset	3658 switch (next.type)
196 ea3f66901fa4 - Added code for parsing template parameter lists for functions. aziz parents: 195 diff changeset	3659 {
ea3f66901fa4 - Added code for parsing template parameter lists for functions. aziz parents: 195 diff changeset	3660 case T.RParen:
ea3f66901fa4 - Added code for parsing template parameter lists for functions. aziz parents: 195 diff changeset	3661 if (--level == 0)
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	3662 { // Closing parentheses found.
232 2a4e2c8ca094 - Renamed method isTemplateParameterList() to tokenAfterParenIs(). aziz parents: 231 diff changeset	3663 lx.peek(next);
196 ea3f66901fa4 - Added code for parsing template parameter lists for functions. aziz parents: 195 diff changeset	3664 break;
ea3f66901fa4 - Added code for parsing template parameter lists for functions. aziz parents: 195 diff changeset	3665 }
ea3f66901fa4 - Added code for parsing template parameter lists for functions. aziz parents: 195 diff changeset	3666 continue;
ea3f66901fa4 - Added code for parsing template parameter lists for functions. aziz parents: 195 diff changeset	3667 case T.LParen:
ea3f66901fa4 - Added code for parsing template parameter lists for functions. aziz parents: 195 diff changeset	3668 ++level;
ea3f66901fa4 - Added code for parsing template parameter lists for functions. aziz parents: 195 diff changeset	3669 continue;
ea3f66901fa4 - Added code for parsing template parameter lists for functions. aziz parents: 195 diff changeset	3670 case T.EOF:
ea3f66901fa4 - Added code for parsing template parameter lists for functions. aziz parents: 195 diff changeset	3671 break;
ea3f66901fa4 - Added code for parsing template parameter lists for functions. aziz parents: 195 diff changeset	3672 default:
ea3f66901fa4 - Added code for parsing template parameter lists for functions. aziz parents: 195 diff changeset	3673 continue;
ea3f66901fa4 - Added code for parsing template parameter lists for functions. aziz parents: 195 diff changeset	3674 }
ea3f66901fa4 - Added code for parsing template parameter lists for functions. aziz parents: 195 diff changeset	3675 break;
ea3f66901fa4 - Added code for parsing template parameter lists for functions. aziz parents: 195 diff changeset	3676 }
232 2a4e2c8ca094 - Renamed method isTemplateParameterList() to tokenAfterParenIs(). aziz parents: 231 diff changeset	3677
2a4e2c8ca094 - Renamed method isTemplateParameterList() to tokenAfterParenIs(). aziz parents: 231 diff changeset	3678 return next.type == tok;
196 ea3f66901fa4 - Added code for parsing template parameter lists for functions. aziz parents: 195 diff changeset	3679 }
ea3f66901fa4 - Added code for parsing template parameter lists for functions. aziz parents: 195 diff changeset	3680
98 aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3681 Type parseDeclaratorSuffix(Type t)
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3682 {
192 5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	3683 switch (token.type)
98 aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3684 {
192 5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	3685 case T.LBracket:
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	3686 // Type Identifier ArrayType
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	3687 // ArrayType := [] or [Type] or [Expression..Expression]
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	3688 do
106 441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	3689 t = parseArrayType(t);
192 5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	3690 while (token.type == T.LBracket)
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	3691 break;
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	3692 /+ // parsed in parseDeclaration()
192 5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	3693 case T.LParen:
258 112a57f433f2 - Created class TemplateParameters. aziz parents: 257 diff changeset	3694 TemplateParameters tparams;
232 2a4e2c8ca094 - Renamed method isTemplateParameterList() to tokenAfterParenIs(). aziz parents: 231 diff changeset	3695 if (tokenAfterParenIs(T.LParen))
196 ea3f66901fa4 - Added code for parsing template parameter lists for functions. aziz parents: 195 diff changeset	3696 {
ea3f66901fa4 - Added code for parsing template parameter lists for functions. aziz parents: 195 diff changeset	3697 // ( TemplateParameterList ) ( ParameterList )
ea3f66901fa4 - Added code for parsing template parameter lists for functions. aziz parents: 195 diff changeset	3698 tparams = parseTemplateParameterList();
ea3f66901fa4 - Added code for parsing template parameter lists for functions. aziz parents: 195 diff changeset	3699 }
ea3f66901fa4 - Added code for parsing template parameter lists for functions. aziz parents: 195 diff changeset	3700
192 5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	3701 auto params = parseParameterList();
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	3702 // ReturnType FunctionName ( ParameterList )
196 ea3f66901fa4 - Added code for parsing template parameter lists for functions. aziz parents: 195 diff changeset	3703 t = new FunctionType(t, params, tparams);
192 5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	3704 break;
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	3705 +/
192 5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	3706 default:
98 aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3707 break;
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3708 }
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3709 return t;
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3710 }
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3711
106 441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	3712 Type parseArrayType(Type t)
441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	3713 {
441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	3714 assert(token.type == T.LBracket);
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3715 auto begin = token;
106 441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	3716 nT();
441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	3717 if (token.type == T.RBracket)
441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	3718 {
441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	3719 t = new ArrayType(t);
441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	3720 nT();
441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	3721 }
441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	3722 else
441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	3723 {
214 45fc474c1678 - Changed 'failed' parameter of try_() to 'success'. aziz parents: 213 diff changeset	3724 bool success;
45fc474c1678 - Changed 'failed' parameter of try_() to 'success'. aziz parents: 213 diff changeset	3725 auto assocType = try_(parseType(), success);
45fc474c1678 - Changed 'failed' parameter of try_() to 'success'. aziz parents: 213 diff changeset	3726 if (success)
106 441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	3727 t = new ArrayType(t, assocType);
441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	3728 else
441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	3729 {
441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	3730 Expression e = parseExpression(), e2;
441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	3731 if (token.type == T.Slice)
441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	3732 {
441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	3733 nT();
441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	3734 e2 = parseExpression();
441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	3735 }
441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	3736 t = new ArrayType(t, e, e2);
441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	3737 }
441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	3738 require(T.RBracket);
441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	3739 }
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3740 set(t, begin);
106 441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	3741 return t;
441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	3742 }
441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	3743
253 4279b638c63e - Changed some string types to Token. Adapted parser accordingly. aziz* parents: 252 diff changeset	3744 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	3745 {
104 b535016f8c3f - DeclaratorSuffix must be parsed after an Identifier. aziz parents: 103 diff changeset	3746 auto t = parseType();
98 aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3747
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3748 if (token.type == T.Identifier)
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3749 {
253 4279b638c63e - Changed some string types to Token. Adapted parser accordingly. aziz* parents: 252 diff changeset	3750 ident = token;
95 0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	3751 nT();
104 b535016f8c3f - DeclaratorSuffix must be parsed after an Identifier. aziz parents: 103 diff changeset	3752 t = parseDeclaratorSuffix(t);
95 0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	3753 }
100 538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	3754 else if (!identOptional)
124 d4c4cea6ee7f - Renamed method errorIfNot() to expected(). aziz parents: 123 diff changeset	3755 expected(T.Identifier);
98 aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3756
104 b535016f8c3f - DeclaratorSuffix must be parsed after an Identifier. aziz parents: 103 diff changeset	3757 return t;
95 0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	3758 }
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	3759
143 e760d7552f66 - Renamed parseArgumentList() to parseArguments(). aziz parents: 141 diff changeset	3760 Expression[] parseArguments(TOK terminator)
138 91b5187ed775 - Moved parseArgumentList() down a bit. aziz parents: 137 diff changeset	3761 {
155 cd4394ef4b59 - Added two asserts to parseArguments(). aziz parents: 154 diff changeset	3762 assert(token.type == T.LParen \|\| token.type == T.LBracket \|\| token.type == T.Comma);
cd4394ef4b59 - Added two asserts to parseArguments(). aziz parents: 154 diff changeset	3763 assert(terminator == T.RParen \|\| terminator == T.RBracket);
139 d48f345b05f8 - Implemented parseTemplateArgumentList(). aziz parents: 138 diff changeset	3764 Expression[] args;
138 91b5187ed775 - Moved parseArgumentList() down a bit. aziz parents: 137 diff changeset	3765
91b5187ed775 - Moved parseArgumentList() down a bit. aziz parents: 137 diff changeset	3766 nT();
91b5187ed775 - Moved parseArgumentList() down a bit. aziz parents: 137 diff changeset	3767 if (token.type == terminator)
91b5187ed775 - Moved parseArgumentList() down a bit. aziz parents: 137 diff changeset	3768 {
91b5187ed775 - Moved parseArgumentList() down a bit. aziz parents: 137 diff changeset	3769 nT();
91b5187ed775 - Moved parseArgumentList() down a bit. aziz parents: 137 diff changeset	3770 return null;
91b5187ed775 - Moved parseArgumentList() down a bit. aziz parents: 137 diff changeset	3771 }
91b5187ed775 - Moved parseArgumentList() down a bit. aziz parents: 137 diff changeset	3772
139 d48f345b05f8 - Implemented parseTemplateArgumentList(). aziz parents: 138 diff changeset	3773 goto LenterLoop;
d48f345b05f8 - Implemented parseTemplateArgumentList(). aziz parents: 138 diff changeset	3774 do
138 91b5187ed775 - Moved parseArgumentList() down a bit. aziz parents: 137 diff changeset	3775 {
139 d48f345b05f8 - Implemented parseTemplateArgumentList(). aziz parents: 138 diff changeset	3776 nT();
d48f345b05f8 - Implemented parseTemplateArgumentList(). aziz parents: 138 diff changeset	3777 LenterLoop:
d48f345b05f8 - Implemented parseTemplateArgumentList(). aziz parents: 138 diff changeset	3778 args ~= parseAssignExpression();
d48f345b05f8 - Implemented parseTemplateArgumentList(). aziz parents: 138 diff changeset	3779 } while (token.type == T.Comma)
d48f345b05f8 - Implemented parseTemplateArgumentList(). aziz parents: 138 diff changeset	3780
d48f345b05f8 - Implemented parseTemplateArgumentList(). aziz parents: 138 diff changeset	3781 require(terminator);
d48f345b05f8 - Implemented parseTemplateArgumentList(). aziz parents: 138 diff changeset	3782 return args;
138 91b5187ed775 - Moved parseArgumentList() down a bit. aziz parents: 137 diff changeset	3783 }
91b5187ed775 - Moved parseArgumentList() down a bit. aziz parents: 137 diff changeset	3784
143 e760d7552f66 - Renamed parseArgumentList() to parseArguments(). aziz parents: 141 diff changeset	3785 Parameters parseParameterList()
117 79857de26e86 - Moved class Parameter to module Types. Added struct Parameters. aziz parents: 116 diff changeset	3786 out(params)
96 d12d31d5fc17 - Added out-contract to parseParameters(). aziz parents: 95 diff changeset	3787 {
117 79857de26e86 - Moved class Parameter to module Types. Added struct Parameters. aziz parents: 116 diff changeset	3788 if (params.length > 1)
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters. aziz parents: 116 diff changeset	3789 foreach (param; params.items[0..$-1])
96 d12d31d5fc17 - Added out-contract to parseParameters(). aziz parents: 95 diff changeset	3790 {
117 79857de26e86 - Moved class Parameter to module Types. Added struct Parameters. aziz parents: 116 diff changeset	3791 if (param.isVariadic())
96 d12d31d5fc17 - Added out-contract to parseParameters(). aziz parents: 95 diff changeset	3792 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	3793 }
d12d31d5fc17 - Added out-contract to parseParameters(). aziz parents: 95 diff changeset	3794 }
d12d31d5fc17 - Added out-contract to parseParameters(). aziz parents: 95 diff changeset	3795 body
95 0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	3796 {
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3797 auto begin = token;
95 0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	3798 require(T.LParen);
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	3799
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3800 auto params = new Parameters();
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3801
95 0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	3802 if (token.type == T.RParen)
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	3803 {
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	3804 nT();
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3805 return set(params, begin);
95 0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	3806 }
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	3807
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	3808 while (1)
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	3809 {
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3810 auto paramBegin = token;
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3811 Token* stcTok;
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3812 StorageClass stc, tmp;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3813
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3814 if (token.type == T.Ellipses)
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3815 {
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3816 nT();
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3817 params ~= set(new Parameter(null, null, null, null), paramBegin);
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3818 break; // Exit loop.
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3819 }
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3820
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3821 Lstc_loop:
95 0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	3822 switch (token.type)
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	3823 {
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3824 version(D2)
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3825 {
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3826 case T.Invariant: // D2.0
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3827 if (peekNext() == T.LParen)
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3828 goto default;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3829 tmp = StorageClass.Invariant;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3830 goto Lcommon;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3831 case T.Const: // D2.0
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3832 if (peekNext() == T.LParen)
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3833 goto default;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3834 tmp = StorageClass.Const;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3835 goto Lcommon;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3836 case T.Final: // D2.0
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3837 tmp = StorageClass.Final;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3838 goto Lcommon;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3839 case T.Scope: // D2.0
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3840 tmp = StorageClass.Scope;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3841 goto Lcommon;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3842 case T.Static: // D2.0
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3843 tmp = StorageClass.Static;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3844 goto Lcommon;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3845 case T.In:
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3846 tmp = StorageClass.In;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3847 goto Lcommon;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3848 case T.Out:
282 74113a9aa77c - Fix: assigned wrong StorageClass to variable. aziz parents: 280 diff changeset	3849 tmp = StorageClass.Out;
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3850 goto Lcommon;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3851 case T.Inout, T.Ref:
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3852 tmp = StorageClass.Ref;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3853 goto Lcommon;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3854 case T.Lazy:
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3855 tmp = StorageClass.Lazy;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3856 goto Lcommon;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3857 Lcommon:
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3858 if (stc & tmp)
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3859 error(MID.RedundantStorageClass, token.srcText);
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3860 else
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3861 stc \|= tmp;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3862 nT();
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3863 goto Lstc_loop;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3864 }
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3865 else // else body of version(D2)
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3866 {
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3867 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	3868 stcTok = token;
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3869 nT();
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3870 goto default;
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3871 }
95 0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	3872 default:
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3873 version(D2)
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3874 {
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3875 if (stc != StorageClass.None)
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3876 stcTok = begin;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3877 }
253 4279b638c63e - Changed some string types to Token. Adapted parser accordingly. aziz* parents: 252 diff changeset	3878 Token* ident;
130 0467f01ed524 - Fix: parameters can have optional identifier. aziz parents: 129 diff changeset	3879 auto type = parseDeclarator(ident, true);
99 6b8c248f5911 - Added member type to classes CastExpression and TypeidExpression. aziz parents: 98 diff changeset	3880
95 0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	3881 Expression assignExpr;
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	3882 if (token.type == T.Assign)
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	3883 {
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	3884 nT();
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	3885 assignExpr = parseAssignExpression();
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	3886 }
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	3887
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	3888 if (token.type == T.Ellipses)
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	3889 {
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3890 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	3891 p.stc \|= StorageClass.Variadic;
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3892 params ~= p;
95 0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	3893 nT();
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3894 break; // Exit loop.
95 0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	3895 }
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	3896
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3897 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	3898
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3899 if (token.type != T.Comma)
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3900 break; // Exit loop.
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3901 nT();
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3902 continue;
95 0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	3903 }
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3904 break; // Exit loop.
95 0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	3905 }
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	3906 require(T.RParen);
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3907 return set(params, begin);
95 0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	3908 }
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	3909
150 753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	3910 TemplateArguments parseTemplateArguments()
139 d48f345b05f8 - Implemented parseTemplateArgumentList(). aziz parents: 138 diff changeset	3911 {
254 eb6e3f1fbfee - Removed typedef and created a proper TemplateArguments class. aziz parents: 253 diff changeset	3912 auto begin = token;
eb6e3f1fbfee - Removed typedef and created a proper TemplateArguments class. aziz parents: 253 diff changeset	3913 auto args = new TemplateArguments;
139 d48f345b05f8 - Implemented parseTemplateArgumentList(). aziz parents: 138 diff changeset	3914
d48f345b05f8 - Implemented parseTemplateArgumentList(). aziz parents: 138 diff changeset	3915 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	3916 if (token.type != T.RParen)
139 d48f345b05f8 - Implemented parseTemplateArgumentList(). aziz parents: 138 diff changeset	3917 {
255 7ba0229af908 - Fixed parseTemplateArguments. Removed a return path and put the while loop into an if-statement. aziz parents: 254 diff changeset	3918 while (1)
139 d48f345b05f8 - Implemented parseTemplateArgumentList(). aziz parents: 138 diff changeset	3919 {
255 7ba0229af908 - Fixed parseTemplateArguments. Removed a return path and put the while loop into an if-statement. aziz parents: 254 diff changeset	3920 bool success;
7ba0229af908 - Fixed parseTemplateArguments. Removed a return path and put the while loop into an if-statement. aziz parents: 254 diff changeset	3921 auto typeArgument = try_(parseType(), success);
7ba0229af908 - Fixed parseTemplateArguments. Removed a return path and put the while loop into an if-statement. aziz parents: 254 diff changeset	3922 if (success)
7ba0229af908 - Fixed parseTemplateArguments. Removed a return path and put the while loop into an if-statement. aziz parents: 254 diff changeset	3923 {
7ba0229af908 - Fixed parseTemplateArguments. Removed a return path and put the while loop into an if-statement. aziz parents: 254 diff changeset	3924 // TemplateArgument:
7ba0229af908 - Fixed parseTemplateArguments. Removed a return path and put the while loop into an if-statement. aziz parents: 254 diff changeset	3925 // Type
7ba0229af908 - Fixed parseTemplateArguments. Removed a return path and put the while loop into an if-statement. aziz parents: 254 diff changeset	3926 // Symbol
7ba0229af908 - Fixed parseTemplateArguments. Removed a return path and put the while loop into an if-statement. aziz parents: 254 diff changeset	3927 args ~= typeArgument;
7ba0229af908 - Fixed parseTemplateArguments. Removed a return path and put the while loop into an if-statement. aziz parents: 254 diff changeset	3928 }
7ba0229af908 - Fixed parseTemplateArguments. Removed a return path and put the while loop into an if-statement. aziz parents: 254 diff changeset	3929 else
7ba0229af908 - Fixed parseTemplateArguments. Removed a return path and put the while loop into an if-statement. aziz parents: 254 diff changeset	3930 {
7ba0229af908 - Fixed parseTemplateArguments. Removed a return path and put the while loop into an if-statement. aziz parents: 254 diff changeset	3931 // TemplateArgument:
7ba0229af908 - Fixed parseTemplateArguments. Removed a return path and put the while loop into an if-statement. aziz parents: 254 diff changeset	3932 // AssignExpression
7ba0229af908 - Fixed parseTemplateArguments. Removed a return path and put the while loop into an if-statement. aziz parents: 254 diff changeset	3933 args ~= parseAssignExpression();
7ba0229af908 - Fixed parseTemplateArguments. Removed a return path and put the while loop into an if-statement. aziz parents: 254 diff changeset	3934 }
7ba0229af908 - Fixed parseTemplateArguments. Removed a return path and put the while loop into an if-statement. aziz parents: 254 diff changeset	3935 if (token.type != T.Comma)
7ba0229af908 - Fixed parseTemplateArguments. Removed a return path and put the while loop into an if-statement. aziz parents: 254 diff changeset	3936 break; // Exit loop.
7ba0229af908 - Fixed parseTemplateArguments. Removed a return path and put the while loop into an if-statement. aziz parents: 254 diff changeset	3937 nT();
139 d48f345b05f8 - Implemented parseTemplateArgumentList(). aziz parents: 138 diff changeset	3938 }
255 7ba0229af908 - Fixed parseTemplateArguments. Removed a return path and put the while loop into an if-statement. aziz parents: 254 diff changeset	3939 }
139 d48f345b05f8 - Implemented parseTemplateArgumentList(). aziz parents: 138 diff changeset	3940 require(T.RParen);
254 eb6e3f1fbfee - Removed typedef and created a proper TemplateArguments class. aziz parents: 253 diff changeset	3941 set(args, begin);
139 d48f345b05f8 - Implemented parseTemplateArgumentList(). aziz parents: 138 diff changeset	3942 return args;
d48f345b05f8 - Implemented parseTemplateArgumentList(). aziz parents: 138 diff changeset	3943 }
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3944 version(D2)
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3945 {
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3946 TemplateArguments parseTemplateArguments2()
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3947 {
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3948 assert(token.type == T.Comma);
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3949 nT();
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3950 auto begin = token;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3951 auto args = new TemplateArguments;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3952
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3953 if (token.type != T.RParen)
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3954 {
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3955 while (1)
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3956 {
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3957 bool success;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3958 auto typeArgument = try_(parseType(), success);
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3959 if (success)
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3960 {
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3961 // TemplateArgument:
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3962 // Type
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3963 // Symbol
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3964 args ~= typeArgument;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3965 }
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3966 else
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3967 {
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3968 // TemplateArgument:
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3969 // AssignExpression
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3970 args ~= parseAssignExpression();
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3971 }
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3972 if (token.type != T.Comma)
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3973 break; // Exit loop.
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3974 nT();
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3975 }
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3976 }
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3977 else
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3978 error(MID.ExpectedButFound, "Type/Expression", ")");
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3979 require(T.RParen);
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3980 set(args, begin);
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3981 return args;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3982 }
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3983 } // version(D2)
258 112a57f433f2 - Created class TemplateParameters. aziz parents: 257 diff changeset	3984 TemplateParameters parseTemplateParameterList()
137 b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	3985 {
258 112a57f433f2 - Created class TemplateParameters. aziz parents: 257 diff changeset	3986 auto begin = token;
295 75b47c71a34c - Assigning to Node.children in several constructors that inherit from Node. aziz parents: 293 diff changeset	3987 auto tparams = new TemplateParameters;
75b47c71a34c - Assigning to Node.children in several constructors that inherit from Node. aziz parents: 293 diff changeset	3988
137 b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	3989 require(T.LParen);
340 1accb3013bd2 - Changed class TemplateParameter to an abstract class. aziz parents: 335 diff changeset	3990 if (token.type != T.RParen)
137 b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	3991 while (1)
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	3992 {
258 112a57f433f2 - Created class TemplateParameters. aziz parents: 257 diff changeset	3993 auto paramBegin = token;
340 1accb3013bd2 - Changed class TemplateParameter to an abstract class. aziz parents: 335 diff changeset	3994 TemplateParameter tp;
253 4279b638c63e - Changed some string types to Token. Adapted parser accordingly. aziz* parents: 252 diff changeset	3995 Token* ident;
137 b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	3996 Type specType, defType;
340 1accb3013bd2 - Changed class TemplateParameter to an abstract class. aziz parents: 335 diff changeset	3997
1accb3013bd2 - Changed class TemplateParameter to an abstract class. aziz parents: 335 diff changeset	3998 void parseSpecAndOrDefaultType()
137 b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	3999 {
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4000 // : SpecializationType
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4001 if (token.type == T.Colon)
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4002 {
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4003 nT();
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4004 specType = parseType();
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4005 }
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4006 // = DefaultType
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4007 if (token.type == T.Assign)
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4008 {
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4009 nT();
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4010 defType = parseType();
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4011 }
340 1accb3013bd2 - Changed class TemplateParameter to an abstract class. aziz parents: 335 diff changeset	4012 }
1accb3013bd2 - Changed class TemplateParameter to an abstract class. aziz parents: 335 diff changeset	4013
1accb3013bd2 - Changed class TemplateParameter to an abstract class. aziz parents: 335 diff changeset	4014 switch (token.type)
1accb3013bd2 - Changed class TemplateParameter to an abstract class. aziz parents: 335 diff changeset	4015 {
1accb3013bd2 - Changed class TemplateParameter to an abstract class. aziz parents: 335 diff changeset	4016 case T.Alias:
1accb3013bd2 - Changed class TemplateParameter to an abstract class. aziz parents: 335 diff changeset	4017 // TemplateAliasParameter:
1accb3013bd2 - Changed class TemplateParameter to an abstract class. aziz parents: 335 diff changeset	4018 // alias Identifier
1accb3013bd2 - Changed class TemplateParameter to an abstract class. aziz parents: 335 diff changeset	4019 nT(); // Skip alias keyword.
1accb3013bd2 - Changed class TemplateParameter to an abstract class. aziz parents: 335 diff changeset	4020 ident = requireId();
1accb3013bd2 - Changed class TemplateParameter to an abstract class. aziz parents: 335 diff changeset	4021 parseSpecAndOrDefaultType();
1accb3013bd2 - Changed class TemplateParameter to an abstract class. aziz parents: 335 diff changeset	4022 tp = new TemplateAliasParameter(ident, specType, defType);
137 b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4023 break;
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4024 case T.Identifier:
253 4279b638c63e - Changed some string types to Token. Adapted parser accordingly. aziz* parents: 252 diff changeset	4025 ident = token;
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	4026 switch (peekNext())
137 b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4027 {
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4028 case T.Ellipses:
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4029 // TemplateTupleParameter:
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4030 // Identifier ...
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4031 nT(); // Skip Identifier.
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4032 nT(); // Skip Ellipses.
341 3ac651ea83fb - Fix: created TemplateAliasParameter instead of TemplateTypeParameter. aziz parents: 340 diff changeset	4033 if (token.type == T.Comma)
342 f13d551d7c4f - Added error messages MID.InContract and MID.OutContract. aziz parents: 341 diff changeset	4034 error(MID.TemplateTupleParameter);
340 1accb3013bd2 - Changed class TemplateParameter to an abstract class. aziz parents: 335 diff changeset	4035 tp = new TemplateTupleParameter(ident);
137 b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4036 break;
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4037 case T.Comma, T.RParen, T.Colon, T.Assign:
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4038 // TemplateTypeParameter:
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4039 // Identifier
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4040 nT(); // Skip Identifier.
340 1accb3013bd2 - Changed class TemplateParameter to an abstract class. aziz parents: 335 diff changeset	4041 parseSpecAndOrDefaultType();
341 3ac651ea83fb - Fix: created TemplateAliasParameter instead of TemplateTypeParameter. aziz parents: 340 diff changeset	4042 tp = new TemplateTypeParameter(ident, specType, defType);
137 b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4043 break;
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4044 default:
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4045 // TemplateValueParameter:
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4046 // Declarator
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4047 ident = null;
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4048 goto LTemplateValueParameter;
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4049 }
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4050 break;
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4051 default:
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4052 LTemplateValueParameter:
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4053 // TemplateValueParameter:
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4054 // Declarator
340 1accb3013bd2 - Changed class TemplateParameter to an abstract class. aziz parents: 335 diff changeset	4055 Expression specValue, defValue;
1accb3013bd2 - Changed class TemplateParameter to an abstract class. aziz parents: 335 diff changeset	4056 auto valueType = parseDeclarator(ident);
137 b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4057 // : SpecializationValue
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4058 if (token.type == T.Colon)
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4059 {
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4060 nT();
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4061 specValue = parseCondExpression();
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4062 }
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4063 // = DefaultValue
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4064 if (token.type == T.Assign)
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4065 {
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4066 nT();
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4067 defValue = parseCondExpression();
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4068 }
340 1accb3013bd2 - Changed class TemplateParameter to an abstract class. aziz parents: 335 diff changeset	4069 tp = new TemplateValueParameter(valueType, ident, specValue, defValue);
137 b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4070 }
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4071
340 1accb3013bd2 - Changed class TemplateParameter to an abstract class. aziz parents: 335 diff changeset	4072 // Push template parameter.
1accb3013bd2 - Changed class TemplateParameter to an abstract class. aziz parents: 335 diff changeset	4073 tparams ~= set(tp, paramBegin);
137 b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4074
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4075 if (token.type != T.Comma)
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4076 break;
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4077 nT();
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4078 }
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4079 require(T.RParen);
258 112a57f433f2 - Created class TemplateParameters. aziz parents: 257 diff changeset	4080 set(tparams, begin);
137 b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4081 return tparams;
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4082 }
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4083
124 d4c4cea6ee7f - Renamed method errorIfNot() to expected(). aziz parents: 123 diff changeset	4084 void expected(TOK tok)
86 0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	4085 {
87 c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	4086 if (token.type != tok)
327 a48a987f7515 - Added package dil to import declarations. aziz parents: 326 diff changeset	4087 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	4088 }
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	4089
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	4090 void require(TOK tok)
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	4091 {
87 c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	4092 if (token.type == tok)
86 0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	4093 nT();
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	4094 else
327 a48a987f7515 - Added package dil to import declarations. aziz parents: 326 diff changeset	4095 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	4096 }
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	4097
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	4098 void requireNext(TOK tok)
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	4099 {
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	4100 nT();
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	4101 require(tok);
86 0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	4102 }
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	4103
243 461e544ebb53 - Added method requireId(). aziz parents: 242 diff changeset	4104 Token* requireId()
461e544ebb53 - Added method requireId(). aziz parents: 242 diff changeset	4105 {
461e544ebb53 - Added method requireId(). aziz parents: 242 diff changeset	4106 if (token.type == T.Identifier)
461e544ebb53 - Added method requireId(). aziz parents: 242 diff changeset	4107 {
461e544ebb53 - Added method requireId(). aziz parents: 242 diff changeset	4108 auto id = token;
461e544ebb53 - Added method requireId(). aziz parents: 242 diff changeset	4109 nT();
461e544ebb53 - Added method requireId(). aziz parents: 242 diff changeset	4110 return id;
461e544ebb53 - Added method requireId(). aziz parents: 242 diff changeset	4111 }
461e544ebb53 - Added method requireId(). aziz parents: 242 diff changeset	4112 else
461e544ebb53 - Added method requireId(). aziz parents: 242 diff changeset	4113 error(MID.ExpectedButFound, "Identifier", token.srcText);
461e544ebb53 - Added method requireId(). aziz parents: 242 diff changeset	4114 return null;
461e544ebb53 - Added method requireId(). aziz parents: 242 diff changeset	4115 }
461e544ebb53 - Added method requireId(). aziz parents: 242 diff changeset	4116
71 b3777cca323c - Added Identity and NotIdentity tokens. aziz parents: 70 diff changeset	4117 void error(MID id, ...)
b3777cca323c - Added Identity and NotIdentity tokens. aziz parents: 70 diff changeset	4118 {
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	4119 if (trying)
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	4120 {
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	4121 ++errorCount;
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	4122 return;
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	4123 }
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	4124
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	4125 // if (errors.length == 10)
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	4126 // return;
94 0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	4127 errors ~= new Information(InfoType.Parser, id, lx.loc, arguments(_arguments, _argptr));
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	4128 // writefln("(%d)P: ", lx.loc, errors[$-1].getMsg);
71 b3777cca323c - Added Identity and NotIdentity tokens. aziz parents: 70 diff changeset	4129 }
65 6c21ae79fbb3 - Renamed function Token.span to Token.srcText. aziz parents: 0 diff changeset	4130 }

Mercurial > projects > dil

annotate trunk/src/dil/Parser.d @ 367:dda55fae37de