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

annotate trunk/src/Parser.d @ 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. - Added method isWhitespace() to Token. Adapted parser accordingly.

author	aziz
date	Wed, 15 Aug 2007 19:57:01 +0000
parents	1c1adededd8f
children	a1c9d93a66e3

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

Mercurial > projects > dil

annotate trunk/src/Parser.d @ 314:ebd21bbf296e