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

annotate trunk/src/Parser.d @ 232:2a4e2c8ca094

- Renamed method isTemplateParameterList() to tokenAfterParenIs(). - Checking for T.LBrace after right parenthesis before parsing as ParameterList.

author	aziz
date	Fri, 27 Jul 2007 12:12:05 +0000
parents	6846138a0e24
children	c2b601dcd57d

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

Mercurial > projects > dil

annotate trunk/src/Parser.d @ 232:2a4e2c8ca094