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

annotate trunk/src/Parser.d @ 263:ebcf7941f1db

- Changed some string types to Token*.

author	aziz
date	Fri, 03 Aug 2007 17:08:02 +0000
parents	0f22269e76ff
children	50cc74026ea8

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

Mercurial > projects > dil

annotate trunk/src/Parser.d @ 263:ebcf7941f1db