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

annotate trunk/src/Parser.d @ 242:7ec7ad8df9da

- Changed type of member tok in class BinaryExpression to Token*. - Added method set() to Parser. - Classes Parameter and Parameters inherit from Node now. - Added member stcTok to Parameter. Changed constructor accordingly. - Added member Other to enum NodeType. - Added local variable 'begin' to many parse functions. Also calling the set() method to set the begin and end token for the parsed object. - Fix: in some cases parsing AAs would cause getting caught in an infinite loop.

author	aziz
date	Wed, 01 Aug 2007 10:12:01 +0000
parents	deab661906ae
children	461e544ebb53

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

Mercurial > projects > dil

annotate trunk/src/Parser.d @ 242:7ec7ad8df9da