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

annotate trunk/src/dil/Parser.d @ 326:4a7359b88c11

- Added package 'dil' to module declarations.

author	aziz
date	Tue, 21 Aug 2007 16:35:04 +0000
parents	540ec3753263
children	a48a987f7515

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

Mercurial > projects > dil

annotate trunk/src/dil/Parser.d @ 326:4a7359b88c11