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

annotate trunk/src/Parser.d @ 130:0467f01ed524

- Fix: parameters can have optional identifier. - Added code for parsing delegates of type ( ArgumentList ) FunctionBody. - Added class FunctionType. - Added class FunctionLiteralExpression.

author	aziz
date	Tue, 10 Jul 2007 16:49:01 +0000
parents	a9244d409652
children	ce636f3981cc

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;
65 6c21ae79fbb3 - Renamed function Token.span to Token.srcText. aziz parents: 0 diff changeset	14
71 b3777cca323c - Added Identity and NotIdentity tokens. aziz parents: 70 diff changeset	15 private alias TOK T;
b3777cca323c - Added Identity and NotIdentity tokens. aziz parents: 70 diff changeset	16
65 6c21ae79fbb3 - Renamed function Token.span to Token.srcText. aziz parents: 0 diff changeset	17 class Parser
6c21ae79fbb3 - Renamed function Token.span to Token.srcText. aziz parents: 0 diff changeset	18 {
71 b3777cca323c - Added Identity and NotIdentity tokens. aziz parents: 70 diff changeset	19 Lexer lx;
87 c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	20 Token* token;
71 b3777cca323c - Added Identity and NotIdentity tokens. aziz parents: 70 diff changeset	21
b3777cca323c - Added Identity and NotIdentity tokens. aziz parents: 70 diff changeset	22 Information[] errors;
b3777cca323c - Added Identity and NotIdentity tokens. aziz parents: 70 diff changeset	23
b3777cca323c - Added Identity and NotIdentity tokens. aziz parents: 70 diff changeset	24 this(char[] srcText, string fileName)
b3777cca323c - Added Identity and NotIdentity tokens. aziz parents: 70 diff changeset	25 {
b3777cca323c - Added Identity and NotIdentity tokens. aziz parents: 70 diff changeset	26 lx = new Lexer(srcText, fileName);
87 c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	27 }
c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	28
c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	29 void nT()
c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	30 {
c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	31 lx.nextToken();
c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	32 token = &lx.token;
71 b3777cca323c - Added Identity and NotIdentity tokens. aziz parents: 70 diff changeset	33 }
70 0d3ef6daec04 - Added Expression class stubs. aziz parents: 69 diff changeset	34
102 6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	35 void skipToOnePast(TOK tok)
6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	36 {
6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	37 for (; token.type != tok && token.type != T.EOF; nT())
6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	38 {}
6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	39 nT();
6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	40 }
105 df34ec47fb81 - Added getState() method and State struct to Lexer. aziz parents: 104 diff changeset	41
106 441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	42 ReturnType try_(ReturnType)(lazy ReturnType parseMethod, out bool failed)
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	43 {
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	44 auto len = errors.length;
105 df34ec47fb81 - Added getState() method and State struct to Lexer. aziz parents: 104 diff changeset	45 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	46 auto result = parseMethod();
105 df34ec47fb81 - Added getState() method and State struct to Lexer. aziz parents: 104 diff changeset	47 // If the length of the array changed we know an error occurred.
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	48 if (errors.length != len)
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	49 {
105 df34ec47fb81 - Added getState() method and State struct to Lexer. aziz parents: 104 diff changeset	50 lexerState.restore(); // Restore state of the Lexer object.
df34ec47fb81 - Added getState() method and State struct to Lexer. aziz parents: 104 diff changeset	51 errors = errors[0..len]; // Remove errors that were added when parseMethod() was called.
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	52 failed = 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	53 }
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	54 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	55 }
105 df34ec47fb81 - Added getState() method and State struct to Lexer. aziz parents: 104 diff changeset	56
102 6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	57 /++++++++++++++++++++++++++++++
6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	58 + Declaration parsing methods +
6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	59 ++++++++++++++++++++++++++++++/
6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	60
6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	61 Declaration[] parseModule()
6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	62 {
6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	63 Declaration[] decls;
6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	64
6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	65 if (token.type == T.Module)
6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	66 {
115 cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier(). aziz parents: 114 diff changeset	67 ModuleName moduleName;
102 6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	68 do
6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	69 {
6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	70 nT();
115 cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier(). aziz parents: 114 diff changeset	71 moduleName ~= requireIdentifier();
102 6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	72 } while (token.type == T.Dot)
6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	73 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	74 decls ~= new ModuleDeclaration(moduleName);
102 6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	75 }
110 2fb631daaaae - Renamed methods. aziz parents: 109 diff changeset	76 decls ~= parseDeclarationDefinitions();
102 6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	77 return decls;
6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	78 }
6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	79
110 2fb631daaaae - Renamed methods. aziz parents: 109 diff changeset	80 Declaration[] parseDeclarationDefinitions()
102 6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	81 {
6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	82 Declaration[] decls;
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	83 while (token.type != T.RBrace && token.type != T.EOF)
110 2fb631daaaae - Renamed methods. aziz parents: 109 diff changeset	84 decls ~= parseDeclarationDefinitions();
102 6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	85 return decls;
6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	86 }
6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	87
110 2fb631daaaae - Renamed methods. aziz parents: 109 diff changeset	88 Declaration parseDeclarationDefinition()
102 6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	89 {
103 511a1aa25896 - Added reportErrors member to Lexer. Moved peek() down and rewrote it a bit making use of reportErrors. error() uses reportErrors too. aziz parents: 102 diff changeset	90 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	91 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	92 {
511a1aa25896 - Added reportErrors member to Lexer. Moved peek() down and rewrote it a bit making use of reportErrors. error() uses reportErrors too. aziz parents: 102 diff changeset	93 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	94 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	95 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	96 T.Deprecated,
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	97 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	98 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	99 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	100 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	101 T.Export,
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	102 //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	103 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	104 T.Override,
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	105 T.Abstract,
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	106 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	107 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	108 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	109 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	110 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	111 break;
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	112 case 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	113 Token t;
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	114 lx.peek(t);
119 363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	115
125 240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	116 switch (t.type)
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	117 {
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	118 case T.Import:
119 363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	119 goto case T.Import;
125 240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	120 case T.This:
119 363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	121 decl = parseStaticConstructorDeclaration();
125 240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	122 break;
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	123 case T.Tilde:
119 363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	124 decl = parseStaticDestructorDeclaration();
125 240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	125 break;
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	126 case T.If:
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	127 decl = parseStaticIfDeclaration();
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	128 break;
127 cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration. aziz parents: 126 diff changeset	129 case T.Assert:
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration. aziz parents: 126 diff changeset	130 decl = parseStaticAssertDeclaration();
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration. aziz parents: 126 diff changeset	131 break;
125 240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	132 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	133 goto case_AttributeSpecifier;
125 240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	134 }
119 363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	135 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	136 case T.Import:
107 722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	137 decl = parseImportDeclaration();
109 d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	138 break;
107 722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	139 case T.Enum:
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	140 decl = parseEnumDeclaration();
109 d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	141 break;
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	142 case T.Class:
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	143 decl = parseClassDeclaration();
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	144 break;
112 004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	145 case T.Interface:
004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	146 decl = parseInterfaceDeclaration();
004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	147 break;
113 20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	148 case T.Struct, T.Union:
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	149 decl = parseAggregateDeclaration();
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	150 break;
117 79857de26e86 - Moved class Parameter to module Types. Added struct Parameters. aziz parents: 116 diff changeset	151 case T.This:
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters. aziz parents: 116 diff changeset	152 decl = parseConstructorDeclaration();
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters. aziz parents: 116 diff changeset	153 break;
118 379f33cbd521 - Added parseDestructorDeclaration() and DestructorDeclaration class. aziz parents: 117 diff changeset	154 case T.Tilde:
379f33cbd521 - Added parseDestructorDeclaration() and DestructorDeclaration class. aziz parents: 117 diff changeset	155 decl = parseDestructorDeclaration();
379f33cbd521 - Added parseDestructorDeclaration() and DestructorDeclaration class. aziz parents: 117 diff changeset	156 break;
120 e5329dac0405 - Added parseInvariantDeclaration(). aziz parents: 119 diff changeset	157 case T.Invariant:
e5329dac0405 - Added parseInvariantDeclaration(). aziz parents: 119 diff changeset	158 decl = parseInvariantDeclaration();
e5329dac0405 - Added parseInvariantDeclaration(). aziz parents: 119 diff changeset	159 break;
121 030933c6b5f0 - Added parseUnittestDeclaration(). aziz parents: 120 diff changeset	160 case T.Unittest:
030933c6b5f0 - Added parseUnittestDeclaration(). aziz parents: 120 diff changeset	161 decl = parseUnittestDeclaration();
030933c6b5f0 - Added parseUnittestDeclaration(). aziz parents: 120 diff changeset	162 break;
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	163 case T.Debug:
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	164 decl = parseDebugDeclaration();
129 a9244d409652 - Added class EmptyDeclaration. aziz parents: 128 diff changeset	165 case T.Semicolon:
a9244d409652 - Added class EmptyDeclaration. aziz parents: 128 diff changeset	166 nT();
a9244d409652 - Added class EmptyDeclaration. aziz parents: 128 diff changeset	167 decl = new EmptyDeclaration();
a9244d409652 - Added class EmptyDeclaration. aziz parents: 128 diff changeset	168 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	169 case T.Module:
130 0467f01ed524 - Fix: parameters can have optional identifier. aziz parents: 129 diff changeset	170 // Error: module is optional and can appear only once at the top of the source file.
109 d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	171 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	172 default:
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	173 }
129 a9244d409652 - Added class EmptyDeclaration. aziz parents: 128 diff changeset	174 return decl;
102 6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	175 }
6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	176
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	177 /*
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	178 DeclarationsBlock:
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	179 : DeclDefs
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	180 { }
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	181 { DeclDefs }
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	182 DeclDef
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	183 */
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	184 Declaration[] parseDeclarationsBlock()
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	185 {
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	186 Declaration[] decls;
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	187 switch (token.type)
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	188 {
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	189 case T.LBrace:
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	190 nT();
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	191 if (token.type == T.RBrace)
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	192 nT();
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	193 else
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	194 {
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	195 decls = parseDeclarationDefinitions();
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	196 require(T.RBrace);
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	197 }
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	198 break;
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	199 case T.Colon:
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	200 nT();
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	201 decls = parseDeclarationDefinitions();
123 0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	202 assert(token.type == T.RBrace \|\| token.type == T.EOF);
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	203 break;
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	204 default:
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	205 decls ~= parseDeclarationDefinition();
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	206 }
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	207 return decls;
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	208 }
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	209
117 79857de26e86 - Moved class Parameter to module Types. Added struct Parameters. aziz parents: 116 diff changeset	210 Statement[] parseStatements()
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters. aziz parents: 116 diff changeset	211 {
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters. aziz parents: 116 diff changeset	212 return null;
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters. aziz parents: 116 diff changeset	213 }
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters. aziz parents: 116 diff changeset	214
103 511a1aa25896 - Added reportErrors member to Lexer. Moved peek() down and rewrote it a bit making use of reportErrors. error() uses reportErrors too. aziz parents: 102 diff changeset	215 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	216 {
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	217 // Attribute :
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	218 // Attribute DeclarationBlock
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	219 return null;
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	220 }
511a1aa25896 - Added reportErrors member to Lexer. Moved peek() down and rewrote it a bit making use of reportErrors. error() uses reportErrors too. aziz parents: 102 diff changeset	221
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	222 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	223 {
107 722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	224 assert(token.type == T.Import \|\| token.type == T.Static);
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	225
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	226 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	227 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	228
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	229 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	230 {
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	231 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	232 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	233 }
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	234
114 83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	235 ModuleName[] moduleNames;
83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	236 string[] moduleAliases;
83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	237 string[] bindNames;
83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	238 string[] bindAliases;
83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	239
115 cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier(). aziz parents: 114 diff changeset	240 nT(); // Skip import keyword.
114 83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	241 do
83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	242 {
83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	243 ModuleName moduleName;
83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	244 string moduleAlias;
83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	245
115 cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier(). aziz parents: 114 diff changeset	246 moduleAlias = requireIdentifier();
cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier(). aziz parents: 114 diff changeset	247
cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier(). aziz parents: 114 diff changeset	248 // AliasName = ModuleName
cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier(). aziz parents: 114 diff changeset	249 if (token.type == T.Assign)
114 83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	250 {
83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	251 nT();
115 cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier(). aziz parents: 114 diff changeset	252 moduleName ~= requireIdentifier();
114 83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	253 }
115 cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier(). aziz parents: 114 diff changeset	254 else // import Identifier [^=]
114 83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	255 {
83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	256 moduleName ~= moduleAlias;
83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	257 moduleAlias = null;
83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	258 }
115 cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier(). aziz parents: 114 diff changeset	259
114 83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	260
83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	261 // parse Identifier(.Identifier)*
83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	262 while (token.type == T.Dot)
83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	263 {
83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	264 nT();
115 cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier(). aziz parents: 114 diff changeset	265 moduleName ~= requireIdentifier();
114 83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	266 }
83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	267
83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	268 // Push identifiers.
83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	269 moduleNames ~= moduleName;
83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	270 moduleAliases ~= moduleAlias;
83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	271
83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	272 // parse : BindAlias = BindName(, BindAlias = BindName)*;
83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	273 // : BindName(, BindName)*;
83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	274 if (token.type == T.Colon)
83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	275 {
83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	276 string bindName, bindAlias;
83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	277 do
83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	278 {
83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	279 nT();
115 cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier(). aziz parents: 114 diff changeset	280 bindAlias = requireIdentifier();
114 83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	281
83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	282 if (token.type == T.Assign)
83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	283 {
83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	284 nT();
115 cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier(). aziz parents: 114 diff changeset	285 bindName = requireIdentifier();
114 83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	286 }
83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	287 else
83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	288 {
83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	289 bindName = bindAlias;
83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	290 bindAlias = null;
83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	291 }
83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	292
83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	293 // Push identifiers.
83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	294 bindNames ~= bindName;
83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	295 bindAliases ~= bindAlias;
83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	296
83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	297 } while (token.type == T.Comma)
83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	298 break;
83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	299 }
83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	300 } while (token.type == T.Comma)
83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	301 require(T.Semicolon);
83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	302
83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	303 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	304 }
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	305
107 722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	306 Declaration parseEnumDeclaration()
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	307 {
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	308 assert(token.type == T.Enum);
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	309
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	310 string enumName;
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	311 Type baseType;
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	312 string[] members;
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	313 Expression[] values;
126 0f0e7352e91d - Renamed member hasDefinition of class Declaration to hasBody. aziz parents: 125 diff changeset	314 bool hasBody;
107 722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	315
115 cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier(). aziz parents: 114 diff changeset	316 nT(); // Skip enum keyword.
cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier(). aziz parents: 114 diff changeset	317 enumName = requireIdentifier();
107 722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	318
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	319 if (token.type == T.Colon)
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	320 {
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	321 nT();
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	322 baseType = parseBasicType();
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	323 }
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	324
115 cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier(). aziz parents: 114 diff changeset	325 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	326 {
cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier(). aziz parents: 114 diff changeset	327 //if (ident.length == 0)
cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier(). aziz parents: 114 diff changeset	328 // TODO: issue error msg
cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier(). aziz parents: 114 diff changeset	329 nT();
cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier(). aziz parents: 114 diff changeset	330 }
cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier(). aziz parents: 114 diff changeset	331 else if (token.type == T.LBrace)
107 722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	332 {
126 0f0e7352e91d - Renamed member hasDefinition of class Declaration to hasBody. aziz parents: 125 diff changeset	333 hasBody = true;
107 722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	334 nT();
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	335 do
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	336 {
115 cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier(). aziz parents: 114 diff changeset	337 members ~= requireIdentifier();
107 722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	338
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	339 if (token.type == T.Assign)
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	340 {
115 cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier(). aziz parents: 114 diff changeset	341 nT();
107 722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	342 values ~= parseAssignExpression();
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	343 }
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	344 else
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	345 values ~= null;
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	346
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	347 if (token.type == T.Comma)
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	348 nT();
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	349 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	350 {
124 d4c4cea6ee7f - Renamed method errorIfNot() to expected(). aziz parents: 123 diff changeset	351 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	352 break;
cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier(). aziz parents: 114 diff changeset	353 }
107 722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	354 } while (token.type != T.RBrace)
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	355 nT();
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	356 }
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	357
126 0f0e7352e91d - Renamed member hasDefinition of class Declaration to hasBody. aziz parents: 125 diff changeset	358 return new EnumDeclaration(enumName, baseType, members, values, hasBody);
107 722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	359 }
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	360
109 d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	361 Declaration parseClassDeclaration()
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	362 {
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	363 assert(token.type == T.Class);
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	364
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	365 string className;
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	366 BaseClass[] bases;
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	367 Declaration[] decls;
126 0f0e7352e91d - Renamed member hasDefinition of class Declaration to hasBody. aziz parents: 125 diff changeset	368 bool hasBody;
109 d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	369
115 cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier(). aziz parents: 114 diff changeset	370 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	371 className = requireIdentifier();
109 d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	372
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	373 if (token.type == T.LParen)
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	374 {
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	375 // TODO: parse template parameters
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	376 }
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	377
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	378 if (token.type == T.Colon)
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	379 bases = parseBaseClasses();
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	380
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	381 if (token.type == T.Semicolon)
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	382 {
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	383 //if (bases.length != 0)
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	384 // error: bases classes are not allowed in forward declarations.
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	385 nT();
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	386 }
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	387 else if (token.type == T.LBrace)
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	388 {
126 0f0e7352e91d - Renamed member hasDefinition of class Declaration to hasBody. aziz parents: 125 diff changeset	389 hasBody = true;
109 d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	390 nT();
115 cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier(). aziz parents: 114 diff changeset	391 // 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.
110 2fb631daaaae - Renamed methods. aziz parents: 109 diff changeset	392 decls = parseDeclarationDefinitions();
109 d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	393 require(T.RBrace);
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	394 }
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	395 else
124 d4c4cea6ee7f - Renamed method errorIfNot() to expected(). aziz parents: 123 diff changeset	396 expected(T.LBrace); // TODO: better error msg
109 d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	397
113 20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	398 // TODO: error if decls.length == 0
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	399
126 0f0e7352e91d - Renamed member hasDefinition of class Declaration to hasBody. aziz parents: 125 diff changeset	400 return new ClassDeclaration(className, bases, decls, hasBody);
109 d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	401 }
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	402
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	403 BaseClass[] parseBaseClasses()
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	404 {
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	405 assert(token.type == T.Colon);
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	406
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	407 BaseClass[] bases;
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	408
117 79857de26e86 - Moved class Parameter to module Types. Added struct Parameters. aziz parents: 116 diff changeset	409 nT(); // Skip colon
109 d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	410
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	411 while (1)
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	412 {
117 79857de26e86 - Moved class Parameter to module Types. Added struct Parameters. aziz parents: 116 diff changeset	413 Protection prot = Protection.Public;
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters. aziz parents: 116 diff changeset	414 string name;
109 d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	415 switch (token.type)
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	416 {
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	417 case T.Identifier: goto LisIdentifier;
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	418 case T.Private: prot = Protection.Private; break;
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	419 case T.Protected: prot = Protection.Protected; break;
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	420 case T.Package: prot = Protection.Package; break;
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	421 case T.Public: /prot = Protection.Public;/ break;
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	422 //case T.Dot: // What about "class Foo : .Bar"?
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	423 default:
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	424 // TODO: issue error msg
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	425 return bases;
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	426 }
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	427 nT();
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	428 if (token.type == T.Identifier)
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	429 {
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	430 LisIdentifier:
117 79857de26e86 - Moved class Parameter to module Types. Added struct Parameters. aziz parents: 116 diff changeset	431 name = token.identifier;
109 d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	432 nT();
112 004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	433 // TODO: handle template instantiations: class Foo : Bar!(int)
109 d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	434 }
115 cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier(). aziz parents: 114 diff changeset	435 else
124 d4c4cea6ee7f - Renamed method errorIfNot() to expected(). aziz parents: 123 diff changeset	436 expected(T.Identifier);
117 79857de26e86 - Moved class Parameter to module Types. Added struct Parameters. aziz parents: 116 diff changeset	437 bases ~= new BaseClass(prot, name);
109 d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	438 if (token.type != T.Comma)
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	439 break;
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	440 }
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	441 return bases;
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	442 }
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	443
112 004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	444 Declaration parseInterfaceDeclaration()
004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	445 {
004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	446 assert(token.type == T.Interface);
004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	447
004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	448 string name;
004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	449 BaseClass[] bases;
004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	450 Declaration[] decls;
126 0f0e7352e91d - Renamed member hasDefinition of class Declaration to hasBody. aziz parents: 125 diff changeset	451 bool hasBody;
112 004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	452
115 cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier(). aziz parents: 114 diff changeset	453 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	454 name = requireIdentifier();
112 004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	455
004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	456 if (token.type == T.LParen)
004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	457 {
004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	458 // TODO: parse template parameters
004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	459 }
004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	460
004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	461 if (token.type == T.Colon)
004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	462 bases = parseBaseClasses();
004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	463
004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	464 if (token.type == T.Semicolon)
004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	465 {
004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	466 //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	467 // TODO: error: base classes are not allowed in forward declarations.
112 004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	468 nT();
004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	469 }
004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	470 else if (token.type == T.LBrace)
004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	471 {
126 0f0e7352e91d - Renamed member hasDefinition of class Declaration to hasBody. aziz parents: 125 diff changeset	472 hasBody = true;
112 004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	473 nT();
004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	474 decls = parseDeclarationDefinitions();
004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	475 require(T.RBrace);
004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	476 }
004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	477 else
124 d4c4cea6ee7f - Renamed method errorIfNot() to expected(). aziz parents: 123 diff changeset	478 expected(T.LBrace); // TODO: better error msg
112 004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	479
113 20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	480 // TODO: error if decls.length == 0
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	481
126 0f0e7352e91d - Renamed member hasDefinition of class Declaration to hasBody. aziz parents: 125 diff changeset	482 return new InterfaceDeclaration(name, bases, decls, hasBody);
112 004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	483 }
004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	484
113 20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	485 Declaration parseAggregateDeclaration()
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	486 {
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	487 assert(token.type == T.Struct \|\| token.type == T.Union);
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	488
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	489 TOK tok = token.type;
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	490
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	491 string name;
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	492 Declaration[] decls;
126 0f0e7352e91d - Renamed member hasDefinition of class Declaration to hasBody. aziz parents: 125 diff changeset	493 bool hasBody;
113 20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	494
115 cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier(). aziz parents: 114 diff changeset	495 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	496 // name is optional.
113 20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	497 if (token.type == T.Identifier)
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	498 {
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	499 name = token.identifier;
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	500 nT();
115 cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier(). aziz parents: 114 diff changeset	501 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	502 {
cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier(). aziz parents: 114 diff changeset	503 // TODO: parse template parameters
cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier(). aziz parents: 114 diff changeset	504 }
113 20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	505 }
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	506
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	507 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	508 {
cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier(). aziz parents: 114 diff changeset	509 //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	510 // TODO: error: forward declarations must have a name.
113 20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	511 nT();
115 cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier(). aziz parents: 114 diff changeset	512 }
113 20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	513 else if (token.type == T.LBrace)
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	514 {
126 0f0e7352e91d - Renamed member hasDefinition of class Declaration to hasBody. aziz parents: 125 diff changeset	515 hasBody = true;
113 20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	516 nT();
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	517 decls = parseDeclarationDefinitions();
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	518 require(T.RBrace);
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	519 }
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	520 else
124 d4c4cea6ee7f - Renamed method errorIfNot() to expected(). aziz parents: 123 diff changeset	521 expected(T.LBrace); // TODO: better error msg
113 20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	522
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	523 // TODO: error if decls.length == 0
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	524
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	525 if (tok == T.Struct)
126 0f0e7352e91d - Renamed member hasDefinition of class Declaration to hasBody. aziz parents: 125 diff changeset	526 return new StructDeclaration(name, decls, hasBody);
113 20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	527 else
126 0f0e7352e91d - Renamed member hasDefinition of class Declaration to hasBody. aziz parents: 125 diff changeset	528 return new UnionDeclaration(name, decls, hasBody);
113 20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	529 }
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	530
117 79857de26e86 - Moved class Parameter to module Types. Added struct Parameters. aziz parents: 116 diff changeset	531 Declaration parseConstructorDeclaration()
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters. aziz parents: 116 diff changeset	532 {
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters. aziz parents: 116 diff changeset	533 assert(token.type == T.This);
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters. aziz parents: 116 diff changeset	534 nT(); // Skip 'this' keyword.
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters. aziz parents: 116 diff changeset	535 auto parameters = parseParameters();
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters. aziz parents: 116 diff changeset	536 require(T.LBrace);
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters. aziz parents: 116 diff changeset	537 auto statements = parseStatements();
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters. aziz parents: 116 diff changeset	538 require(T.RBrace);
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters. aziz parents: 116 diff changeset	539 return new ConstructorDeclaration(parameters, statements);
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters. aziz parents: 116 diff changeset	540 }
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters. aziz parents: 116 diff changeset	541
118 379f33cbd521 - Added parseDestructorDeclaration() and DestructorDeclaration class. aziz parents: 117 diff changeset	542 Declaration parseDestructorDeclaration()
379f33cbd521 - Added parseDestructorDeclaration() and DestructorDeclaration class. aziz parents: 117 diff changeset	543 {
379f33cbd521 - Added parseDestructorDeclaration() and DestructorDeclaration class. aziz parents: 117 diff changeset	544 assert(token.type == T.Tilde);
379f33cbd521 - Added parseDestructorDeclaration() and DestructorDeclaration class. aziz parents: 117 diff changeset	545 nT(); // Skip ~
379f33cbd521 - Added parseDestructorDeclaration() and DestructorDeclaration class. aziz parents: 117 diff changeset	546 require(T.This);
379f33cbd521 - Added parseDestructorDeclaration() and DestructorDeclaration class. aziz parents: 117 diff changeset	547 require(T.LParen);
379f33cbd521 - Added parseDestructorDeclaration() and DestructorDeclaration class. aziz parents: 117 diff changeset	548 require(T.RParen);
379f33cbd521 - Added parseDestructorDeclaration() and DestructorDeclaration class. aziz parents: 117 diff changeset	549 require(T.LBrace);
379f33cbd521 - Added parseDestructorDeclaration() and DestructorDeclaration class. aziz parents: 117 diff changeset	550 auto statements = parseStatements();
379f33cbd521 - Added parseDestructorDeclaration() and DestructorDeclaration class. aziz parents: 117 diff changeset	551 require(T.RBrace);
379f33cbd521 - Added parseDestructorDeclaration() and DestructorDeclaration class. aziz parents: 117 diff changeset	552 return new DestructorDeclaration(statements);
379f33cbd521 - Added parseDestructorDeclaration() and DestructorDeclaration class. aziz parents: 117 diff changeset	553 }
379f33cbd521 - Added parseDestructorDeclaration() and DestructorDeclaration class. aziz parents: 117 diff changeset	554
119 363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	555 Declaration parseStaticConstructorDeclaration()
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	556 {
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	557 assert(token.type == T.Static);
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	558 nT(); // Skip static keyword.
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	559 nT(); // Skip 'this' keyword.
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	560 require(T.LParen);
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	561 require(T.RParen);
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	562 require(T.LBrace);
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	563 auto statements = parseStatements();
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	564 require(T.RBrace);
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	565 return new StaticConstructorDeclaration(statements);
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	566 }
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	567
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	568 Declaration parseStaticDestructorDeclaration()
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	569 {
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	570 assert(token.type == T.Static);
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	571 nT(); // Skip static keyword.
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	572 nT(); // Skip ~
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	573 require(T.This);
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	574 require(T.LParen);
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	575 require(T.RParen);
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	576 require(T.LBrace);
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	577 auto statements = parseStatements();
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	578 require(T.RBrace);
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	579 return new StaticDestructorDeclaration(statements);
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	580 }
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	581
120 e5329dac0405 - Added parseInvariantDeclaration(). aziz parents: 119 diff changeset	582 Declaration parseInvariantDeclaration()
e5329dac0405 - Added parseInvariantDeclaration(). aziz parents: 119 diff changeset	583 {
e5329dac0405 - Added parseInvariantDeclaration(). aziz parents: 119 diff changeset	584 assert(token.type == T.Invariant);
e5329dac0405 - Added parseInvariantDeclaration(). aziz parents: 119 diff changeset	585 nT(); // Skip invariant keyword.
e5329dac0405 - Added parseInvariantDeclaration(). aziz parents: 119 diff changeset	586 // Optional () for getting ready porting to D 2.0
e5329dac0405 - Added parseInvariantDeclaration(). aziz parents: 119 diff changeset	587 if (token.type == T.LParen)
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	588 requireNext(T.RParen);
120 e5329dac0405 - Added parseInvariantDeclaration(). aziz parents: 119 diff changeset	589 require(T.LBrace);
e5329dac0405 - Added parseInvariantDeclaration(). aziz parents: 119 diff changeset	590 auto statements = parseStatements();
e5329dac0405 - Added parseInvariantDeclaration(). aziz parents: 119 diff changeset	591 require(T.RBrace);
e5329dac0405 - Added parseInvariantDeclaration(). aziz parents: 119 diff changeset	592 return new InvariantDeclaration(statements);
e5329dac0405 - Added parseInvariantDeclaration(). aziz parents: 119 diff changeset	593 }
e5329dac0405 - Added parseInvariantDeclaration(). aziz parents: 119 diff changeset	594
121 030933c6b5f0 - Added parseUnittestDeclaration(). aziz parents: 120 diff changeset	595 Declaration parseUnittestDeclaration()
030933c6b5f0 - Added parseUnittestDeclaration(). aziz parents: 120 diff changeset	596 {
030933c6b5f0 - Added parseUnittestDeclaration(). aziz parents: 120 diff changeset	597 assert(token.type == T.Unittest);
030933c6b5f0 - Added parseUnittestDeclaration(). aziz parents: 120 diff changeset	598
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	599 nT(); // Skip unittest keyword.
121 030933c6b5f0 - Added parseUnittestDeclaration(). aziz parents: 120 diff changeset	600 require(T.LBrace);
030933c6b5f0 - Added parseUnittestDeclaration(). aziz parents: 120 diff changeset	601 auto statements = parseStatements();
030933c6b5f0 - Added parseUnittestDeclaration(). aziz parents: 120 diff changeset	602 require(T.RBrace);
030933c6b5f0 - Added parseUnittestDeclaration(). aziz parents: 120 diff changeset	603 return new UnittestDeclaration(statements);
030933c6b5f0 - Added parseUnittestDeclaration(). aziz parents: 120 diff changeset	604 }
030933c6b5f0 - Added parseUnittestDeclaration(). aziz parents: 120 diff changeset	605
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	606 Declaration parseDebugDeclaration()
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	607 {
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	608 assert(token.type == T.Debug);
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	609
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	610 nT(); // Skip debug keyword.
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	611
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	612 int levelSpec = -1; // debug = Integer ;
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	613 string identSpec; // debug = Identifier ;
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	614 int levelCond = -1; // debug ( Integer )
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	615 string identCond; // debug ( Identifier )
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	616 Declaration[] decls, elseDecls;
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	617
123 0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	618 void parseIdentOrInt(ref string ident, ref int level)
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	619 {
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	620 nT();
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	621 if (token.type == T.Int32)
123 0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	622 level = token.int_;
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	623 else if (token.type == T.Identifier)
123 0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	624 ident = token.identifier;
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	625 else
124 d4c4cea6ee7f - Renamed method errorIfNot() to expected(). aziz parents: 123 diff changeset	626 expected(T.Identifier); // TODO: better error msg
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	627 nT();
123 0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	628 }
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	629
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	630 if (token.type == T.Assign)
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	631 {
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	632 parseIdentOrInt(identSpec, levelSpec);
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	633 require(T.Semicolon);
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	634 }
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	635 else
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	636 {
123 0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	637 // Condition:
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	638 // Integer
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	639 // Identifier
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	640 // ( Condition )
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	641 if (token.type == T.LParen)
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	642 {
123 0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	643 parseIdentOrInt(identCond, levelCond);
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	644 require(T.RParen);
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	645 }
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	646
123 0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	647 // debug DeclarationsBlock
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	648 // debug ( Condition ) DeclarationsBlock
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	649 decls = parseDeclarationsBlock();
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	650
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	651 // else DeclarationsBlock
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	652 // debug without condition and else statement makes no sense
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	653 if (token.type == T.Else && (levelCond != -1 \|\| identCond.length != 0))
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	654 {
123 0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	655 nT();
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	656 //if (token.type == T.Colon)
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	657 // TODO: avoid "else:"?
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	658 elseDecls = parseDeclarationsBlock();
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	659 }
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	660 // else
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	661 // TODO: issue error msg
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	662 }
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	663
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	664 return new DebugDeclaration(levelSpec, identSpec, levelCond, identCond, decls, elseDecls);
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	665 }
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	666
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	667 Declaration parseVersionDeclaration()
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	668 {
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	669 assert(token.type == T.Debug);
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	670
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	671 nT(); // Skip debug keyword.
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	672
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	673 int levelSpec = -1; // version = Integer ;
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	674 string identSpec; // version = Identifier ;
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	675 int levelCond = -1; // version ( Integer )
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	676 string identCond; // version ( Identifier )
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	677 Declaration[] decls, elseDecls;
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	678
123 0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	679 void parseIdentOrInt(ref string ident, ref int level)
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	680 {
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	681 nT();
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	682 if (token.type == T.Int32)
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	683 level = token.int_;
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	684 else if (token.type == T.Identifier)
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	685 ident = token.identifier;
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	686 else
124 d4c4cea6ee7f - Renamed method errorIfNot() to expected(). aziz parents: 123 diff changeset	687 expected(T.Identifier); // TODO: better error msg
123 0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	688 nT();
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	689 }
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	690
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	691 if (token.type == T.Assign)
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	692 {
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	693 parseIdentOrInt(identSpec, levelSpec);
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	694 require(T.Semicolon);
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	695 }
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	696 else
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	697 {
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	698 // Condition:
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	699 // Integer
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	700 // Identifier
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	701 // ( Condition )
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	702 require(T.LParen);
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	703 parseIdentOrInt(identCond, levelCond);
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	704 require(T.RParen);
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	705
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	706 // version ( Condition ) DeclarationsBlock
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	707 decls = parseDeclarationsBlock();
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	708
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	709 // else DeclarationsBlock
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	710 if (token.type == T.Else)
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	711 {
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	712 nT();
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	713 //if (token.type == T.Colon)
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	714 // TODO: avoid "else:"?
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	715 elseDecls = parseDeclarationsBlock();
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	716 }
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	717 }
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	718
123 0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	719 return new VersionDeclaration(levelSpec, identSpec, levelCond, identCond, decls, elseDecls);
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	720 }
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	721
125 240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	722 Declaration parseStaticIfDeclaration()
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	723 {
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	724 assert(token.type == T.Static);
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	725
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	726 nT(); // Skip static keyword.
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	727 nT(); // Skip if keyword.
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	728
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	729 Expression condition;
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	730 Declaration[] ifDecls, elseDecls;
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	731
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	732 require(T.LParen);
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	733 condition = parseAssignExpression();
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	734 require(T.RParen);
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	735
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	736 if (token.type != T.Colon)
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	737 ifDecls = parseDeclarationsBlock();
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	738 else
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	739 expected(T.LBrace); // TODO: better error msg
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	740
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	741 if (token.type == T.Else)
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	742 {
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	743 nT();
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	744 if (token.type != T.Colon)
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	745 elseDecls = parseDeclarationsBlock();
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	746 else
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	747 expected(T.LBrace); // TODO: better error msg
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	748 }
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	749
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	750 return new StaticIfDeclaration(condition, ifDecls, elseDecls);
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	751 }
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	752
127 cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration. aziz parents: 126 diff changeset	753 Declaration parseStaticAssertDeclaration()
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration. aziz parents: 126 diff changeset	754 {
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration. aziz parents: 126 diff changeset	755 assert(token.type == T.Static);
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration. aziz parents: 126 diff changeset	756
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration. aziz parents: 126 diff changeset	757 nT(); // Skip static keyword.
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration. aziz parents: 126 diff changeset	758 nT(); // Skip assert keyword.
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration. aziz parents: 126 diff changeset	759
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration. aziz parents: 126 diff changeset	760 Expression condition, message;
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration. aziz parents: 126 diff changeset	761
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration. aziz parents: 126 diff changeset	762 require(T.LParen);
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration. aziz parents: 126 diff changeset	763
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration. aziz parents: 126 diff changeset	764 condition = parseAssignExpression();
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration. aziz parents: 126 diff changeset	765
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration. aziz parents: 126 diff changeset	766 if (token.type == T.Comma)
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration. aziz parents: 126 diff changeset	767 {
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration. aziz parents: 126 diff changeset	768 nT();
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration. aziz parents: 126 diff changeset	769 message = parseAssignExpression();
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration. aziz parents: 126 diff changeset	770 }
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration. aziz parents: 126 diff changeset	771
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration. aziz parents: 126 diff changeset	772 require(T.RParen);
128 e02b87281b4e - Static asserts have to end with a semicolon. aziz parents: 127 diff changeset	773 require(T.Semicolon);
127 cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration. aziz parents: 126 diff changeset	774
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration. aziz parents: 126 diff changeset	775 return new StaticAssertDeclaration(condition, message);
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration. aziz parents: 126 diff changeset	776 }
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration. aziz parents: 126 diff changeset	777
102 6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	778 /+++++++++++++++++++++++++++++
6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	779 + Expression parsing methods +
6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	780 +++++++++++++++++++++++++++++/
6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	781
72 f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	782 Expression parseExpression()
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	783 {
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	784 auto e = parseAssignExpression();
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	785 while (token.type == T.Comma)
81 aa1ea2548dd9 - Fixed parseExpression() method. aziz parents: 80 diff changeset	786 e = new CommaExpression(e, parseAssignExpression());
72 f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	787 return e;
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	788 }
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	789
71 b3777cca323c - Added Identity and NotIdentity tokens. aziz parents: 70 diff changeset	790 Expression parseAssignExpression()
b3777cca323c - Added Identity and NotIdentity tokens. aziz parents: 70 diff changeset	791 {
b3777cca323c - Added Identity and NotIdentity tokens. aziz parents: 70 diff changeset	792 auto e = parseCondExpression();
72 f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	793 while (1)
71 b3777cca323c - Added Identity and NotIdentity tokens. aziz parents: 70 diff changeset	794 {
87 c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	795 switch (token.type)
72 f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	796 {
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	797 case T.Assign:
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	798 nT(); e = new AssignExpression(e, parseAssignExpression());
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	799 break;
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	800 case T.LShiftAssign:
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	801 nT(); e = new LShiftAssignExpression(e, parseAssignExpression());
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	802 break;
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	803 case T.RShiftAssign:
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	804 nT(); e = new RShiftAssignExpression(e, parseAssignExpression());
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	805 break;
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	806 case T.URShiftAssign:
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	807 nT(); e = new URShiftAssignExpression(e, parseAssignExpression());
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	808 break;
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	809 case T.OrAssign:
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	810 nT(); e = new OrAssignExpression(e, parseAssignExpression());
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	811 break;
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	812 case T.AndAssign:
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	813 nT(); e = new AndAssignExpression(e, parseAssignExpression());
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	814 break;
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	815 case T.PlusAssign:
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	816 nT(); e = new PlusAssignExpression(e, parseAssignExpression());
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	817 break;
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	818 case T.MinusAssign:
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	819 nT(); e = new MinusAssignExpression(e, parseAssignExpression());
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	820 break;
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	821 case T.DivAssign:
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	822 nT(); e = new DivAssignExpression(e, parseAssignExpression());
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	823 break;
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	824 case T.MulAssign:
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	825 nT(); e = new MulAssignExpression(e, parseAssignExpression());
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	826 break;
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	827 case T.ModAssign:
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	828 nT(); e = new ModAssignExpression(e, parseAssignExpression());
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	829 break;
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	830 case T.XorAssign:
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	831 nT(); e = new XorAssignExpression(e, parseAssignExpression());
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	832 break;
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	833 case T.CatAssign:
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	834 nT(); e = new CatAssignExpression(e, parseAssignExpression());
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	835 break;
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	836 default:
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	837 break;
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	838 }
71 b3777cca323c - Added Identity and NotIdentity tokens. aziz parents: 70 diff changeset	839 break;
b3777cca323c - Added Identity and NotIdentity tokens. aziz parents: 70 diff changeset	840 }
b3777cca323c - Added Identity and NotIdentity tokens. aziz parents: 70 diff changeset	841 return e;
b3777cca323c - Added Identity and NotIdentity tokens. aziz parents: 70 diff changeset	842 }
72 f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	843
71 b3777cca323c - Added Identity and NotIdentity tokens. aziz parents: 70 diff changeset	844 Expression parseCondExpression()
b3777cca323c - Added Identity and NotIdentity tokens. aziz parents: 70 diff changeset	845 {
72 f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	846 auto e = parseOrOrExpression();
87 c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	847 if (token.type == T.Question)
72 f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	848 {
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	849 nT();
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	850 auto iftrue = parseExpression();
87 c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	851 require(T.Colon);
72 f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	852 auto iffalse = parseCondExpression();
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	853 e = new CondExpression(e, iftrue, iffalse);
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	854 }
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	855 return e;
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	856 }
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	857
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	858 Expression parseOrOrExpression()
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	859 {
73 11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	860 alias parseAndAndExpression parseNext;
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	861 auto e = parseNext();
87 c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	862 if (token.type == T.OrLogical)
73 11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	863 {
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	864 nT();
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	865 e = new OrOrExpression(e, parseNext());
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	866 }
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	867 return e;
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	868 }
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	869
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	870 Expression parseAndAndExpression()
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	871 {
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	872 alias parseOrExpression parseNext;
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	873 auto e = parseNext();
87 c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	874 if (token.type == T.AndLogical)
73 11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	875 {
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	876 nT();
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	877 e = new AndAndExpression(e, parseNext());
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	878 }
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	879 return e;
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	880 }
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	881
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	882 Expression parseOrExpression()
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	883 {
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	884 alias parseXorExpression parseNext;
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	885 auto e = parseNext();
87 c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	886 if (token.type == T.OrBinary)
73 11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	887 {
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	888 nT();
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	889 e = new OrExpression(e, parseNext());
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	890 }
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	891 return e;
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	892 }
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	893
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	894 Expression parseXorExpression()
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	895 {
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	896 alias parseAndExpression parseNext;
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	897 auto e = parseNext();
87 c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	898 if (token.type == T.Xor)
73 11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	899 {
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	900 nT();
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	901 e = new XorExpression(e, parseNext());
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	902 }
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	903 return e;
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	904 }
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	905
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	906 Expression parseAndExpression()
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	907 {
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	908 alias parseCmpExpression parseNext;
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	909 auto e = parseNext();
87 c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	910 if (token.type == T.AndBinary)
73 11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	911 {
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	912 nT();
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	913 e = new AndExpression(e, parseNext());
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	914 }
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	915 return e;
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	916 }
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	917
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	918 Expression parseCmpExpression()
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	919 {
87 c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	920 TOK operator = token.type;
74 30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	921
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	922 auto e = parseShiftExpression();
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	923
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	924 switch (operator)
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	925 {
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	926 case T.Equal, T.NotEqual:
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	927 nT();
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	928 e = new EqualExpression(e, parseShiftExpression(), operator);
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	929 break;
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	930 case T.Not:
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	931 Token t;
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	932 lx.peek(t);
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	933 if (t.type != T.Is)
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	934 break;
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	935 nT();
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	936 operator = T.NotIdentity;
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	937 goto LNotIdentity;
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	938 case T.Identity:
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	939 operator = T.Identity;
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	940 LNotIdentity:
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	941 nT();
83 9e6d66f647c9 - Fix: IsExpression was created instead of IdentityExpression. aziz parents: 81 diff changeset	942 e = new IdentityExpression(e, parseShiftExpression(), operator);
74 30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	943 break;
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	944 case T.LessEqual, T.Less, T.GreaterEqual, T.Greater,
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	945 T.Unordered, T.UorE, T.UorG, T.UorGorE,
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	946 T.UorL, T.UorLorE, T.LorEorG, T.LorG:
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	947 nT();
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	948 e = new RelExpression(e, parseShiftExpression(), operator);
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	949 break;
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	950 case T.In:
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	951 nT();
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	952 e = new InExpression(e, parseShiftExpression(), operator);
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	953 break;
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	954 default:
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	955 }
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	956 return e;
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	957 }
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	958
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	959 Expression parseShiftExpression()
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	960 {
75 3f976d9e0833 - Implemented parseShiftExpression(). aziz parents: 74 diff changeset	961 auto e = parseAddExpression();
3f976d9e0833 - Implemented parseShiftExpression(). aziz parents: 74 diff changeset	962 while (1)
3f976d9e0833 - Implemented parseShiftExpression(). aziz parents: 74 diff changeset	963 {
87 c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	964 switch (token.type)
75 3f976d9e0833 - Implemented parseShiftExpression(). aziz parents: 74 diff changeset	965 {
3f976d9e0833 - Implemented parseShiftExpression(). aziz parents: 74 diff changeset	966 case T.LShift: nT(); e = new LShiftExpression(e, parseAddExpression()); break;
3f976d9e0833 - Implemented parseShiftExpression(). aziz parents: 74 diff changeset	967 case T.RShift: nT(); e = new RShiftExpression(e, parseAddExpression()); break;
3f976d9e0833 - Implemented parseShiftExpression(). aziz parents: 74 diff changeset	968 case T.URShift: nT(); e = new URShiftExpression(e, parseAddExpression()); break;
3f976d9e0833 - Implemented parseShiftExpression(). aziz parents: 74 diff changeset	969 default: break;
3f976d9e0833 - Implemented parseShiftExpression(). aziz parents: 74 diff changeset	970 }
3f976d9e0833 - Implemented parseShiftExpression(). aziz parents: 74 diff changeset	971 break;
3f976d9e0833 - Implemented parseShiftExpression(). aziz parents: 74 diff changeset	972 }
3f976d9e0833 - Implemented parseShiftExpression(). aziz parents: 74 diff changeset	973 return e;
3f976d9e0833 - Implemented parseShiftExpression(). aziz parents: 74 diff changeset	974 }
3f976d9e0833 - Implemented parseShiftExpression(). aziz parents: 74 diff changeset	975
3f976d9e0833 - Implemented parseShiftExpression(). aziz parents: 74 diff changeset	976 Expression parseAddExpression()
3f976d9e0833 - Implemented parseShiftExpression(). aziz parents: 74 diff changeset	977 {
76 a85f9edf6ce7 - Implemented parseAddExpression(). aziz parents: 75 diff changeset	978 auto e = parseMulExpression();
a85f9edf6ce7 - Implemented parseAddExpression(). aziz parents: 75 diff changeset	979 while (1)
a85f9edf6ce7 - Implemented parseAddExpression(). aziz parents: 75 diff changeset	980 {
87 c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	981 switch (token.type)
76 a85f9edf6ce7 - Implemented parseAddExpression(). aziz parents: 75 diff changeset	982 {
a85f9edf6ce7 - Implemented parseAddExpression(). aziz parents: 75 diff changeset	983 case T.Plus: nT(); e = new PlusExpression(e, parseMulExpression()); break;
a85f9edf6ce7 - Implemented parseAddExpression(). aziz parents: 75 diff changeset	984 case T.Minus: nT(); e = new MinusExpression(e, parseMulExpression()); break;
a85f9edf6ce7 - Implemented parseAddExpression(). aziz parents: 75 diff changeset	985 case T.Tilde: nT(); e = new CatExpression(e, parseMulExpression()); break;
a85f9edf6ce7 - Implemented parseAddExpression(). aziz parents: 75 diff changeset	986 default: break;
a85f9edf6ce7 - Implemented parseAddExpression(). aziz parents: 75 diff changeset	987 }
a85f9edf6ce7 - Implemented parseAddExpression(). aziz parents: 75 diff changeset	988 break;
a85f9edf6ce7 - Implemented parseAddExpression(). aziz parents: 75 diff changeset	989 }
a85f9edf6ce7 - Implemented parseAddExpression(). aziz parents: 75 diff changeset	990 return new Expression();
a85f9edf6ce7 - Implemented parseAddExpression(). aziz parents: 75 diff changeset	991 }
a85f9edf6ce7 - Implemented parseAddExpression(). aziz parents: 75 diff changeset	992
a85f9edf6ce7 - Implemented parseAddExpression(). aziz parents: 75 diff changeset	993 Expression parseMulExpression()
a85f9edf6ce7 - Implemented parseAddExpression(). aziz parents: 75 diff changeset	994 {
77 7e21c4df1c02 - Implemented parseMulExpression(). aziz parents: 76 diff changeset	995 auto e = parseUnaryExpression();
7e21c4df1c02 - Implemented parseMulExpression(). aziz parents: 76 diff changeset	996 while (1)
7e21c4df1c02 - Implemented parseMulExpression(). aziz parents: 76 diff changeset	997 {
87 c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	998 switch (token.type)
77 7e21c4df1c02 - Implemented parseMulExpression(). aziz parents: 76 diff changeset	999 {
7e21c4df1c02 - Implemented parseMulExpression(). aziz parents: 76 diff changeset	1000 case T.Mul: nT(); e = new MulExpression(e, parseUnaryExpression()); break;
7e21c4df1c02 - Implemented parseMulExpression(). aziz parents: 76 diff changeset	1001 case T.Div: nT(); e = new DivExpression(e, parseUnaryExpression()); break;
7e21c4df1c02 - Implemented parseMulExpression(). aziz parents: 76 diff changeset	1002 case T.Mod: nT(); e = new ModExpression(e, parseUnaryExpression()); break;
7e21c4df1c02 - Implemented parseMulExpression(). aziz parents: 76 diff changeset	1003 default: break;
7e21c4df1c02 - Implemented parseMulExpression(). aziz parents: 76 diff changeset	1004 }
7e21c4df1c02 - Implemented parseMulExpression(). aziz parents: 76 diff changeset	1005 break;
7e21c4df1c02 - Implemented parseMulExpression(). aziz parents: 76 diff changeset	1006 }
74 30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	1007 return new Expression();
71 b3777cca323c - Added Identity and NotIdentity tokens. aziz parents: 70 diff changeset	1008 }
b3777cca323c - Added Identity and NotIdentity tokens. aziz parents: 70 diff changeset	1009
91 ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	1010 Expression parseUnaryExpression()
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	1011 {
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	1012 Expression e;
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	1013 switch (token.type)
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	1014 {
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	1015 case T.AndBinary:
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	1016 nT(); e = new AddressExpression(parseUnaryExpression());
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	1017 break;
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	1018 case T.PlusPlus:
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	1019 nT(); e = new PreIncrExpression(parseUnaryExpression());
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	1020 break;
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	1021 case T.MinusMinus:
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	1022 nT(); e = new PreDecrExpression(parseUnaryExpression());
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	1023 break;
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	1024 case T.Mul:
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	1025 nT(); e = new DerefExpression(parseUnaryExpression());
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	1026 break;
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	1027 case T.Minus:
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	1028 case T.Plus:
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	1029 nT(); e = new SignExpression(parseUnaryExpression(), token.type);
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	1030 break;
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	1031 case T.Not:
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	1032 nT(); e = new NotExpression(parseUnaryExpression());
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	1033 break;
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	1034 case T.Tilde:
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	1035 nT(); e = new CompExpression(parseUnaryExpression());
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	1036 break;
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	1037 case T.New:
102 6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	1038 // TODO: parseNewExpression();
91 ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	1039 break;
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	1040 case T.Delete:
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	1041 nT();
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	1042 e = new DeleteExpression(parseUnaryExpression());
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	1043 break;
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	1044 case T.Cast:
99 6b8c248f5911 - Added member type to classes CastExpression and TypeidExpression. aziz parents: 98 diff changeset	1045 requireNext(T.LParen);
6b8c248f5911 - Added member type to classes CastExpression and TypeidExpression. aziz parents: 98 diff changeset	1046 auto type = parseType();
6b8c248f5911 - Added member type to classes CastExpression and TypeidExpression. aziz parents: 98 diff changeset	1047 require(T.RParen);
6b8c248f5911 - Added member type to classes CastExpression and TypeidExpression. aziz parents: 98 diff changeset	1048 e = new CastExpression(parseUnaryExpression(), type);
91 ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	1049 break;
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	1050 case T.LParen:
102 6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	1051 // ( Type ) . Identifier
99 6b8c248f5911 - Added member type to classes CastExpression and TypeidExpression. aziz parents: 98 diff changeset	1052 auto type = parseType();
6b8c248f5911 - Added member type to classes CastExpression and TypeidExpression. aziz parents: 98 diff changeset	1053 require(T.RParen);
6b8c248f5911 - Added member type to classes CastExpression and TypeidExpression. aziz parents: 98 diff changeset	1054 require(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	1055 string ident = requireIdentifier();
99 6b8c248f5911 - Added member type to classes CastExpression and TypeidExpression. aziz parents: 98 diff changeset	1056 e = new TypeDotIdExpression(type, ident);
91 ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	1057 break;
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	1058 default:
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	1059 e = parsePostExpression(parsePrimaryExpression());
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	1060 break;
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	1061 }
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	1062 assert(e !is null);
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	1063 return e;
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	1064 }
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	1065
90 a02950cb7036 - Fixed order of parsing unary, post and primary expressions. aziz parents: 89 diff changeset	1066 Expression parsePostExpression(Expression e)
77 7e21c4df1c02 - Implemented parseMulExpression(). aziz parents: 76 diff changeset	1067 {
79 df4e5c7ad58a - Implemented most of parsePostExpression() and parsePreExpression(). aziz parents: 78 diff changeset	1068 while (1)
df4e5c7ad58a - Implemented most of parsePostExpression() and parsePreExpression(). aziz parents: 78 diff changeset	1069 {
87 c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	1070 switch (token.type)
79 df4e5c7ad58a - Implemented most of parsePostExpression() and parsePreExpression(). aziz parents: 78 diff changeset	1071 {
df4e5c7ad58a - Implemented most of parsePostExpression() and parsePreExpression(). aziz parents: 78 diff changeset	1072 case T.Dot:
df4e5c7ad58a - Implemented most of parsePostExpression() and parsePreExpression(). aziz parents: 78 diff changeset	1073 nT();
87 c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	1074 if (token.type == T.Identifier)
92 6de2e6e7d872 - Fixed parsePostExpression(). aziz parents: 91 diff changeset	1075 {
108 469188935d56 - Added ident member to DotIdExpression. aziz parents: 107 diff changeset	1076 e = new DotIdExpression(e, token.identifier);
93 9f8b6c205ecc - Made fixes to the way the while loop in parsePostExpression() works. aziz parents: 92 diff changeset	1077 break;
92 6de2e6e7d872 - Fixed parsePostExpression(). aziz parents: 91 diff changeset	1078 }
87 c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	1079 else if (token.type == T.New)
81 aa1ea2548dd9 - Fixed parseExpression() method. aziz parents: 80 diff changeset	1080 e = parseNewExpression(e);
92 6de2e6e7d872 - Fixed parsePostExpression(). aziz parents: 91 diff changeset	1081 else
124 d4c4cea6ee7f - Renamed method errorIfNot() to expected(). aziz parents: 123 diff changeset	1082 expected(T.Identifier);
93 9f8b6c205ecc - Made fixes to the way the while loop in parsePostExpression() works. aziz parents: 92 diff changeset	1083 continue;
79 df4e5c7ad58a - Implemented most of parsePostExpression() and parsePreExpression(). aziz parents: 78 diff changeset	1084 case T.PlusPlus:
df4e5c7ad58a - Implemented most of parsePostExpression() and parsePreExpression(). aziz parents: 78 diff changeset	1085 e = new PostIncrExpression(e);
df4e5c7ad58a - Implemented most of parsePostExpression() and parsePreExpression(). aziz parents: 78 diff changeset	1086 break;
df4e5c7ad58a - Implemented most of parsePostExpression() and parsePreExpression(). aziz parents: 78 diff changeset	1087 case T.MinusMinus:
df4e5c7ad58a - Implemented most of parsePostExpression() and parsePreExpression(). aziz parents: 78 diff changeset	1088 e = new PostDecrExpression(e);
df4e5c7ad58a - Implemented most of parsePostExpression() and parsePreExpression(). aziz parents: 78 diff changeset	1089 break;
df4e5c7ad58a - Implemented most of parsePostExpression() and parsePreExpression(). aziz parents: 78 diff changeset	1090 case T.LParen:
81 aa1ea2548dd9 - Fixed parseExpression() method. aziz parents: 80 diff changeset	1091 e = new CallExpression(e, parseArgumentList(T.LParen));
93 9f8b6c205ecc - Made fixes to the way the while loop in parsePostExpression() works. aziz parents: 92 diff changeset	1092 continue;
79 df4e5c7ad58a - Implemented most of parsePostExpression() and parsePreExpression(). aziz parents: 78 diff changeset	1093 case T.LBracket:
df4e5c7ad58a - Implemented most of parsePostExpression() and parsePreExpression(). aziz parents: 78 diff changeset	1094 // parse Slice- and IndexExpression
83 9e6d66f647c9 - Fix: IsExpression was created instead of IdentityExpression. aziz parents: 81 diff changeset	1095 nT();
87 c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	1096 if (token.type == T.RBracket)
83 9e6d66f647c9 - Fix: IsExpression was created instead of IdentityExpression. aziz parents: 81 diff changeset	1097 {
9e6d66f647c9 - Fix: IsExpression was created instead of IdentityExpression. aziz parents: 81 diff changeset	1098 e = new SliceExpression(e, null, null);
9e6d66f647c9 - Fix: IsExpression was created instead of IdentityExpression. aziz parents: 81 diff changeset	1099 break;
9e6d66f647c9 - Fix: IsExpression was created instead of IdentityExpression. aziz parents: 81 diff changeset	1100 }
87 c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	1101
83 9e6d66f647c9 - Fix: IsExpression was created instead of IdentityExpression. aziz parents: 81 diff changeset	1102 Expression[] es = [parseAssignExpression()];
87 c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	1103
c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	1104 if (token.type == T.Slice)
83 9e6d66f647c9 - Fix: IsExpression was created instead of IdentityExpression. aziz parents: 81 diff changeset	1105 {
9e6d66f647c9 - Fix: IsExpression was created instead of IdentityExpression. aziz parents: 81 diff changeset	1106 nT();
9e6d66f647c9 - Fix: IsExpression was created instead of IdentityExpression. aziz parents: 81 diff changeset	1107 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	1108 require(T.RBracket);
93 9f8b6c205ecc - Made fixes to the way the while loop in parsePostExpression() works. aziz parents: 92 diff changeset	1109 continue;
83 9e6d66f647c9 - Fix: IsExpression was created instead of IdentityExpression. aziz parents: 81 diff changeset	1110 }
87 c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	1111 else if (token.type == T.Comma)
83 9e6d66f647c9 - Fix: IsExpression was created instead of IdentityExpression. aziz parents: 81 diff changeset	1112 {
9e6d66f647c9 - Fix: IsExpression was created instead of IdentityExpression. aziz parents: 81 diff changeset	1113 es ~= parseArgumentList(T.RBracket);
9e6d66f647c9 - Fix: IsExpression was created instead of IdentityExpression. aziz parents: 81 diff changeset	1114 }
85 d8dc3171440d - Fixed parsing CallExpression and IndexExpression. aziz parents: 84 diff changeset	1115 else
87 c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	1116 require(T.RBracket);
c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	1117
83 9e6d66f647c9 - Fix: IsExpression was created instead of IdentityExpression. aziz parents: 81 diff changeset	1118 e = new IndexExpression(e, es);
93 9f8b6c205ecc - Made fixes to the way the while loop in parsePostExpression() works. aziz parents: 92 diff changeset	1119 continue;
92 6de2e6e7d872 - Fixed parsePostExpression(). aziz parents: 91 diff changeset	1120 default:
93 9f8b6c205ecc - Made fixes to the way the while loop in parsePostExpression() works. aziz parents: 92 diff changeset	1121 return e;
79 df4e5c7ad58a - Implemented most of parsePostExpression() and parsePreExpression(). aziz parents: 78 diff changeset	1122 }
93 9f8b6c205ecc - Made fixes to the way the while loop in parsePostExpression() works. aziz parents: 92 diff changeset	1123 nT();
79 df4e5c7ad58a - Implemented most of parsePostExpression() and parsePreExpression(). aziz parents: 78 diff changeset	1124 }
93 9f8b6c205ecc - Made fixes to the way the while loop in parsePostExpression() works. aziz parents: 92 diff changeset	1125 assert(0);
79 df4e5c7ad58a - Implemented most of parsePostExpression() and parsePreExpression(). aziz parents: 78 diff changeset	1126 }
df4e5c7ad58a - Implemented most of parsePostExpression() and parsePreExpression(). aziz parents: 78 diff changeset	1127
df4e5c7ad58a - Implemented most of parsePostExpression() and parsePreExpression(). aziz parents: 78 diff changeset	1128 Expression parsePrimaryExpression()
78 f043759fb59a - Added code to parseUnaryExpression(); not fully implemented. aziz parents: 77 diff changeset	1129 {
83 9e6d66f647c9 - Fix: IsExpression was created instead of IdentityExpression. aziz parents: 81 diff changeset	1130 Expression e;
87 c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	1131 switch (token.type)
83 9e6d66f647c9 - Fix: IsExpression was created instead of IdentityExpression. aziz parents: 81 diff changeset	1132 {
9e6d66f647c9 - Fix: IsExpression was created instead of IdentityExpression. aziz parents: 81 diff changeset	1133 case T.Identifier:
107 722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	1134 e = new IdentifierExpression(token.identifier);
89 18c71269fb52 - Added code for parsing IdentifierExpression. aziz parents: 88 diff changeset	1135 nT();
84 ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	1136 break;
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	1137 case T.Dot:
87 c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	1138 requireNext(T.Identifier);
107 722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	1139 e = new GlobalIdExpression(token.identifier);
84 ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	1140 break;
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	1141 case T.This:
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	1142 nT();
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	1143 e = new ThisExpression();
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	1144 break;
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	1145 case T.Super:
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	1146 nT();
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	1147 e = new SuperExpression();
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	1148 break;
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	1149 case T.Null:
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	1150 nT();
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	1151 e = new NullExpression();
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	1152 break;
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	1153 case T.True, T.False:
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	1154 nT();
87 c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	1155 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	1156 break;
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	1157 case T.Dollar:
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	1158 nT();
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	1159 e = new DollarExpression();
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	1160 break;
97 1a83e5070a84 - Added code for parsing IntNumber- and RealNumberExpressions. aziz parents: 96 diff changeset	1161 case T.Int32, T.Int64, T.Uint32, T.Uint64:
1a83e5070a84 - Added code for parsing IntNumber- and RealNumberExpressions. aziz parents: 96 diff changeset	1162 nT();
1a83e5070a84 - Added code for parsing IntNumber- and RealNumberExpressions. aziz parents: 96 diff changeset	1163 e = new IntNumberExpression(token.type, token.ulong_);
1a83e5070a84 - Added code for parsing IntNumber- and RealNumberExpressions. aziz parents: 96 diff changeset	1164 break;
1a83e5070a84 - Added code for parsing IntNumber- and RealNumberExpressions. aziz parents: 96 diff changeset	1165 case T.Float32, T.Float64, T.Float80,
1a83e5070a84 - Added code for parsing IntNumber- and RealNumberExpressions. aziz parents: 96 diff changeset	1166 T.Imaginary32, T.Imaginary64, T.Imaginary80:
1a83e5070a84 - Added code for parsing IntNumber- and RealNumberExpressions. aziz parents: 96 diff changeset	1167 nT();
1a83e5070a84 - Added code for parsing IntNumber- and RealNumberExpressions. aziz parents: 96 diff changeset	1168 e = new RealNumberExpression(token.type, token.real_);
84 ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	1169 break;
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	1170 case T.CharLiteral, T.WCharLiteral, T.DCharLiteral:
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	1171 nT();
87 c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	1172 e = new CharLiteralExpression(token.type);
84 ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	1173 break;
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	1174 case T.String:
87 c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	1175 char[] buffer = token.str;
c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	1176 char postfix = token.pf;
84 ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	1177 nT();
87 c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	1178 while (token.type == T.String)
84 ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	1179 {
87 c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	1180 string tmp = token.str;
c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	1181 // if (postfix != token.pf)
86 0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	1182 // error();
84 ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	1183 if (tmp.length > 1)
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	1184 {
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	1185 buffer[$-1] = tmp[0]; // replace '\0'
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	1186 buffer ~= tmp[1..$]; // append the rest
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	1187 }
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	1188 nT();
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	1189 }
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	1190 e = new StringLiteralExpression(buffer);
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	1191 break;
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	1192 case T.LBracket:
85 d8dc3171440d - Fixed parsing CallExpression and IndexExpression. aziz parents: 84 diff changeset	1193 Expression[] values;
d8dc3171440d - Fixed parsing CallExpression and IndexExpression. aziz parents: 84 diff changeset	1194
d8dc3171440d - Fixed parsing CallExpression and IndexExpression. aziz parents: 84 diff changeset	1195 nT();
87 c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	1196 if (token.type != T.RBracket)
85 d8dc3171440d - Fixed parsing CallExpression and IndexExpression. aziz parents: 84 diff changeset	1197 {
d8dc3171440d - Fixed parsing CallExpression and IndexExpression. aziz parents: 84 diff changeset	1198 e = parseAssignExpression();
87 c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	1199 if (token.type == T.Colon)
85 d8dc3171440d - Fixed parsing CallExpression and IndexExpression. aziz parents: 84 diff changeset	1200 goto LparseAssocArray;
87 c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	1201 else if (token.type == T.Comma)
85 d8dc3171440d - Fixed parsing CallExpression and IndexExpression. aziz parents: 84 diff changeset	1202 values = [e] ~ parseArgumentList(T.RBracket);
87 c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	1203 else
c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	1204 require(T.RBracket);
85 d8dc3171440d - Fixed parsing CallExpression and IndexExpression. aziz parents: 84 diff changeset	1205 }
d8dc3171440d - Fixed parsing CallExpression and IndexExpression. aziz parents: 84 diff changeset	1206
d8dc3171440d - Fixed parsing CallExpression and IndexExpression. aziz parents: 84 diff changeset	1207 e = new ArrayLiteralExpression(values);
d8dc3171440d - Fixed parsing CallExpression and IndexExpression. aziz parents: 84 diff changeset	1208 break;
d8dc3171440d - Fixed parsing CallExpression and IndexExpression. aziz parents: 84 diff changeset	1209
d8dc3171440d - Fixed parsing CallExpression and IndexExpression. aziz parents: 84 diff changeset	1210 LparseAssocArray:
d8dc3171440d - Fixed parsing CallExpression and IndexExpression. aziz parents: 84 diff changeset	1211 Expression[] keys;
d8dc3171440d - Fixed parsing CallExpression and IndexExpression. aziz parents: 84 diff changeset	1212
d8dc3171440d - Fixed parsing CallExpression and IndexExpression. aziz parents: 84 diff changeset	1213 keys ~= e;
d8dc3171440d - Fixed parsing CallExpression and IndexExpression. aziz parents: 84 diff changeset	1214 nT(); // Skip colon.
d8dc3171440d - Fixed parsing CallExpression and IndexExpression. aziz parents: 84 diff changeset	1215 values ~= parseAssignExpression();
d8dc3171440d - Fixed parsing CallExpression and IndexExpression. aziz parents: 84 diff changeset	1216
87 c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	1217 if (token.type != T.RBracket)
88 81cb24669ed3 - Fixed parser of AssocArrayLiteralExpression. aziz parents: 87 diff changeset	1218 {
81cb24669ed3 - Fixed parser of AssocArrayLiteralExpression. aziz parents: 87 diff changeset	1219 require(T.Comma);
85 d8dc3171440d - Fixed parsing CallExpression and IndexExpression. aziz parents: 84 diff changeset	1220 while (1)
d8dc3171440d - Fixed parsing CallExpression and IndexExpression. aziz parents: 84 diff changeset	1221 {
d8dc3171440d - Fixed parsing CallExpression and IndexExpression. aziz parents: 84 diff changeset	1222 keys ~= parseAssignExpression();
87 c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	1223 if (token.type != T.Colon)
85 d8dc3171440d - Fixed parsing CallExpression and IndexExpression. aziz parents: 84 diff changeset	1224 {
124 d4c4cea6ee7f - Renamed method errorIfNot() to expected(). aziz parents: 123 diff changeset	1225 expected(T.Colon);
85 d8dc3171440d - Fixed parsing CallExpression and IndexExpression. aziz parents: 84 diff changeset	1226 values ~= null;
87 c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	1227 if (token.type == T.RBracket)
85 d8dc3171440d - Fixed parsing CallExpression and IndexExpression. aziz parents: 84 diff changeset	1228 break;
d8dc3171440d - Fixed parsing CallExpression and IndexExpression. aziz parents: 84 diff changeset	1229 else
d8dc3171440d - Fixed parsing CallExpression and IndexExpression. aziz parents: 84 diff changeset	1230 continue;
d8dc3171440d - Fixed parsing CallExpression and IndexExpression. aziz parents: 84 diff changeset	1231 }
d8dc3171440d - Fixed parsing CallExpression and IndexExpression. aziz parents: 84 diff changeset	1232 nT();
d8dc3171440d - Fixed parsing CallExpression and IndexExpression. aziz parents: 84 diff changeset	1233 values ~= parseAssignExpression();
87 c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	1234 if (token.type == T.RBracket)
85 d8dc3171440d - Fixed parsing CallExpression and IndexExpression. aziz parents: 84 diff changeset	1235 break;
88 81cb24669ed3 - Fixed parser of AssocArrayLiteralExpression. aziz parents: 87 diff changeset	1236 require(T.Comma);
85 d8dc3171440d - Fixed parsing CallExpression and IndexExpression. aziz parents: 84 diff changeset	1237 }
88 81cb24669ed3 - Fixed parser of AssocArrayLiteralExpression. aziz parents: 87 diff changeset	1238 }
87 c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	1239 assert(token.type == T.RBracket);
85 d8dc3171440d - Fixed parsing CallExpression and IndexExpression. aziz parents: 84 diff changeset	1240 nT();
d8dc3171440d - Fixed parsing CallExpression and IndexExpression. aziz parents: 84 diff changeset	1241 e = new AssocArrayLiteralExpression(keys, values);
84 ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	1242 break;
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	1243 case T.LBrace:
102 6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	1244 // TODO: parse delegate literals: FunctionBody
84 ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	1245 break;
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	1246 case T.Function, T.Delegate:
102 6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	1247 // TODO: parse delegate/function literals:
6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	1248 // function Type? ( ArgumentList ) FunctionBody
6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	1249 // function FunctionBody
6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	1250 // delegate Type? ( ArgumentList ) FunctionBody
6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	1251 // delegate FunctionBody
84 ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	1252 break;
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	1253 case T.Assert:
86 0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	1254 Expression msg;
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	1255 requireNext(T.LParen);
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	1256 e = parseAssignExpression();
87 c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	1257 if (token.type == T.Comma)
86 0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	1258 {
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	1259 nT();
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	1260 msg = parseAssignExpression();
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	1261 }
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	1262 require(T.RParen);
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	1263 e = new AssertExpression(e, msg);
84 ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	1264 break;
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	1265 case T.Mixin:
86 0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	1266 requireNext(T.LParen);
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	1267 e = parseAssignExpression();
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	1268 require(T.RParen);
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	1269 e = new MixinExpression(e);
84 ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	1270 break;
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	1271 case T.Import:
86 0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	1272 requireNext(T.LParen);
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	1273 e = parseAssignExpression();
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	1274 require(T.RParen);
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	1275 e = new ImportExpression(e);
84 ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	1276 break;
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	1277 case T.Typeid:
86 0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	1278 requireNext(T.LParen);
99 6b8c248f5911 - Added member type to classes CastExpression and TypeidExpression. aziz parents: 98 diff changeset	1279 auto type = parseType();
6b8c248f5911 - Added member type to classes CastExpression and TypeidExpression. aziz parents: 98 diff changeset	1280 require(T.RParen);
6b8c248f5911 - Added member type to classes CastExpression and TypeidExpression. aziz parents: 98 diff changeset	1281 e = new TypeidExpression(type);
84 ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	1282 break;
101 6f3c5473c5e5 - Implemented parsing TypeofExpression. aziz parents: 100 diff changeset	1283 case T.Typeof:
6f3c5473c5e5 - Implemented parsing TypeofExpression. aziz parents: 100 diff changeset	1284 requireNext(T.LParen);
6f3c5473c5e5 - Implemented parsing TypeofExpression. aziz parents: 100 diff changeset	1285 auto type = new TypeofType(parseExpression());
6f3c5473c5e5 - Implemented parsing TypeofExpression. aziz parents: 100 diff changeset	1286 require(T.RParen);
6f3c5473c5e5 - Implemented parsing TypeofExpression. aziz parents: 100 diff changeset	1287 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	1288 { // typeof ( Expression ) . Identifier
101 6f3c5473c5e5 - Implemented parsing TypeofExpression. aziz parents: 100 diff changeset	1289 nT();
115 cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier(). aziz parents: 114 diff changeset	1290 string ident = requireIdentifier;
101 6f3c5473c5e5 - Implemented parsing TypeofExpression. aziz parents: 100 diff changeset	1291 e = new TypeDotIdExpression(type, ident);
6f3c5473c5e5 - Implemented parsing TypeofExpression. aziz parents: 100 diff changeset	1292 }
115 cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier(). aziz parents: 114 diff changeset	1293 else // typeof ( Expression )
101 6f3c5473c5e5 - Implemented parsing TypeofExpression. aziz parents: 100 diff changeset	1294 e = new TypeofExpression(type);
6f3c5473c5e5 - Implemented parsing TypeofExpression. aziz parents: 100 diff changeset	1295 break;
84 ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	1296 case T.Is:
100 538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	1297 requireNext(T.LParen);
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	1298
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	1299 Type type;
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	1300 SpecializationType specType;
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	1301 string ident; // optional Identifier
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	1302
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	1303 type = parseDeclarator(ident, true);
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	1304
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	1305 switch (token.type)
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	1306 {
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	1307 case T.Colon, T.Equal:
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	1308 TOK specTok = token.type;
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	1309 nT();
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	1310 switch (token.type)
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	1311 {
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	1312 case T.Typedef,
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	1313 T.Struct,
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	1314 T.Union,
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	1315 T.Class,
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	1316 T.Interface,
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	1317 T.Enum,
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	1318 T.Function,
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	1319 T.Delegate,
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	1320 T.Super,
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	1321 T.Return:
102 6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	1322 nT();
100 538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	1323 specType = new SpecializationType(specTok, token.type);
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	1324 break;
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	1325 default:
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	1326 specType = new SpecializationType(specTok, parseType());
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	1327 }
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	1328 default:
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	1329 }
102 6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	1330 require(T.RParen);
100 538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	1331 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	1332 break;
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	1333 case T.LParen:
130 0467f01ed524 - Fix: parameters can have optional identifier. aziz parents: 129 diff changeset	1334 Token t;
0467f01ed524 - Fix: parameters can have optional identifier. aziz parents: 129 diff changeset	1335 bool failed;
0467f01ed524 - Fix: parameters can have optional identifier. aziz parents: 129 diff changeset	1336 auto parameters = try_(parseParameters(), failed);
0467f01ed524 - Fix: parameters can have optional identifier. aziz parents: 129 diff changeset	1337 if (!failed)
0467f01ed524 - Fix: parameters can have optional identifier. aziz parents: 129 diff changeset	1338 {
0467f01ed524 - Fix: parameters can have optional identifier. aziz parents: 129 diff changeset	1339 // ( ArgumentList ) FunctionBody
0467f01ed524 - Fix: parameters can have optional identifier. aziz parents: 129 diff changeset	1340 require(T.LBrace);
0467f01ed524 - Fix: parameters can have optional identifier. aziz parents: 129 diff changeset	1341 auto decls = parseDeclarationDefinitions();
0467f01ed524 - Fix: parameters can have optional identifier. aziz parents: 129 diff changeset	1342 require(T.RBrace);
0467f01ed524 - Fix: parameters can have optional identifier. aziz parents: 129 diff changeset	1343 auto func = new FunctionType(null, parameters);
0467f01ed524 - Fix: parameters can have optional identifier. aziz parents: 129 diff changeset	1344 e = new FunctionLiteralExpression(func, decls);
0467f01ed524 - Fix: parameters can have optional identifier. aziz parents: 129 diff changeset	1345 }
0467f01ed524 - Fix: parameters can have optional identifier. aziz parents: 129 diff changeset	1346 else
0467f01ed524 - Fix: parameters can have optional identifier. aziz parents: 129 diff changeset	1347 {
0467f01ed524 - Fix: parameters can have optional identifier. aziz parents: 129 diff changeset	1348 nT();
0467f01ed524 - Fix: parameters can have optional identifier. aziz parents: 129 diff changeset	1349 e = parseExpression();
0467f01ed524 - Fix: parameters can have optional identifier. aziz parents: 129 diff changeset	1350 require(T.RParen);
0467f01ed524 - Fix: parameters can have optional identifier. aziz parents: 129 diff changeset	1351 }
84 ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	1352 break;
86 0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	1353 // BasicType . Identifier
94 0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	1354 case T.Void, T.Char, T.Wchar, T.Dchar, T.Bool,
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	1355 T.Byte, T.Ubyte, T.Short, T.Ushort,
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	1356 T.Int, T.Uint, T.Long, T.Ulong,
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	1357 T.Float, T.Double, T.Real,
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	1358 T.Ifloat, T.Idouble, T.Ireal,
86 0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	1359 T.Cfloat, T.Cdouble, T.Creal:
94 0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	1360 auto type = new Type(token.type);
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	1361 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	1362 auto ident = requireIdentifier();
86 0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	1363
94 0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	1364 e = new TypeDotIdExpression(type, ident);
98 aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	1365 break;
84 ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	1366 default:
102 6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	1367 // TODO: issue error msg and decide what to return.
83 9e6d66f647c9 - Fix: IsExpression was created instead of IdentityExpression. aziz parents: 81 diff changeset	1368 }
9e6d66f647c9 - Fix: IsExpression was created instead of IdentityExpression. aziz parents: 81 diff changeset	1369 return e;
77 7e21c4df1c02 - Implemented parseMulExpression(). aziz parents: 76 diff changeset	1370 }
7e21c4df1c02 - Implemented parseMulExpression(). aziz parents: 76 diff changeset	1371
81 aa1ea2548dd9 - Fixed parseExpression() method. aziz parents: 80 diff changeset	1372 Expression parseNewExpression(Expression e)
aa1ea2548dd9 - Fixed parseExpression() method. aziz parents: 80 diff changeset	1373 {
102 6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	1374 // TODO: implement this method.
81 aa1ea2548dd9 - Fixed parseExpression() method. aziz parents: 80 diff changeset	1375 return null;
aa1ea2548dd9 - Fixed parseExpression() method. aziz parents: 80 diff changeset	1376 }
aa1ea2548dd9 - Fixed parseExpression() method. aziz parents: 80 diff changeset	1377
aa1ea2548dd9 - Fixed parseExpression() method. aziz parents: 80 diff changeset	1378 Expression[] parseArgumentList(TOK terminator)
aa1ea2548dd9 - Fixed parseExpression() method. aziz parents: 80 diff changeset	1379 {
aa1ea2548dd9 - Fixed parseExpression() method. aziz parents: 80 diff changeset	1380 Expression[] es;
aa1ea2548dd9 - Fixed parseExpression() method. aziz parents: 80 diff changeset	1381
aa1ea2548dd9 - Fixed parseExpression() method. aziz parents: 80 diff changeset	1382 nT();
87 c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	1383 if (token.type == terminator)
81 aa1ea2548dd9 - Fixed parseExpression() method. aziz parents: 80 diff changeset	1384 {
aa1ea2548dd9 - Fixed parseExpression() method. aziz parents: 80 diff changeset	1385 nT();
aa1ea2548dd9 - Fixed parseExpression() method. aziz parents: 80 diff changeset	1386 return null;
aa1ea2548dd9 - Fixed parseExpression() method. aziz parents: 80 diff changeset	1387 }
aa1ea2548dd9 - Fixed parseExpression() method. aziz parents: 80 diff changeset	1388
aa1ea2548dd9 - Fixed parseExpression() method. aziz parents: 80 diff changeset	1389 while (1)
aa1ea2548dd9 - Fixed parseExpression() method. aziz parents: 80 diff changeset	1390 {
aa1ea2548dd9 - Fixed parseExpression() method. aziz parents: 80 diff changeset	1391 es ~= parseAssignExpression();
87 c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	1392 if (token.type == terminator)
81 aa1ea2548dd9 - Fixed parseExpression() method. aziz parents: 80 diff changeset	1393 break;
88 81cb24669ed3 - Fixed parser of AssocArrayLiteralExpression. aziz parents: 87 diff changeset	1394 require(T.Comma);
81 aa1ea2548dd9 - Fixed parseExpression() method. aziz parents: 80 diff changeset	1395 }
aa1ea2548dd9 - Fixed parseExpression() method. aziz parents: 80 diff changeset	1396 nT();
aa1ea2548dd9 - Fixed parseExpression() method. aziz parents: 80 diff changeset	1397 return es;
aa1ea2548dd9 - Fixed parseExpression() method. aziz parents: 80 diff changeset	1398 }
aa1ea2548dd9 - Fixed parseExpression() method. aziz parents: 80 diff changeset	1399
98 aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	1400 Type parseType()
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	1401 {
104 b535016f8c3f - DeclaratorSuffix must be parsed after an Identifier. aziz parents: 103 diff changeset	1402 return parseBasicType2(parseBasicType());
98 aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	1403 }
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	1404
94 0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	1405 Type parseBasicType()
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	1406 {
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	1407 Type t;
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	1408 IdentifierType tident;
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	1409
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	1410 switch (token.type)
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	1411 {
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	1412 case T.Void, T.Char, T.Wchar, T.Dchar, T.Bool,
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	1413 T.Byte, T.Ubyte, T.Short, T.Ushort,
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	1414 T.Int, T.Uint, T.Long, T.Ulong,
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	1415 T.Float, T.Double, T.Real,
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	1416 T.Ifloat, T.Idouble, T.Ireal,
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	1417 T.Cfloat, T.Cdouble, T.Creal:
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	1418 t = new Type(token.type);
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	1419 nT();
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	1420 break;
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	1421 case T.Identifier, T.Dot:
107 722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	1422 tident = new IdentifierType([token.identifier]);
94 0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	1423 nT();
102 6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	1424 // TODO: parse template instance
94 0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	1425 // if (token.type == T.Not)
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	1426 // parse template instance
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	1427 Lident:
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	1428 while (token.type == T.Dot)
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	1429 {
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	1430 nT();
115 cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier(). aziz parents: 114 diff changeset	1431 tident ~= requireIdentifier();
102 6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	1432 // TODO: parse template instance
94 0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	1433 // if (token.type == T.Not)
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	1434 // parse template instance
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	1435 }
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	1436 t = tident;
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	1437 break;
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	1438 case T.Typeof:
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	1439 requireNext(T.LParen);
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	1440 tident = new TypeofType(parseExpression());
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	1441 require(T.RParen);
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	1442 goto Lident;
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	1443 default:
102 6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	1444 // TODO: issue error msg and return UndefinedType.
94 0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	1445 }
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	1446 return t;
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	1447 }
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	1448
95 0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	1449 Type parseBasicType2(Type t)
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	1450 {
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	1451 while (1)
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	1452 {
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	1453 switch (token.type)
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	1454 {
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	1455 case T.Mul:
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	1456 t = new PointerType(t);
98 aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	1457 nT();
95 0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	1458 break;
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	1459 case T.LBracket:
106 441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	1460 t = parseArrayType(t);
98 aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	1461 break;
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	1462 case T.Function, T.Delegate:
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	1463 TOK tok = token.type;
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	1464 nT();
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	1465 auto args = parseParameters();
102 6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	1466 // TODO: create appropriate Type.
98 aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	1467 // if (tok == T.Function)
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	1468 // t = new FunctionType();
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	1469 // else
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	1470 // t = new DelegateType();
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	1471 break;
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	1472 default:
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	1473 return t;
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	1474 }
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	1475 }
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	1476 assert(0);
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	1477 }
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	1478
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	1479 Type parseDeclaratorSuffix(Type t)
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	1480 {
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	1481 while (1)
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	1482 {
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	1483 switch (token.type)
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	1484 {
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	1485 case T.LBracket:
106 441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	1486 t = parseArrayType(t);
95 0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	1487 continue;
98 aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	1488 case T.LParen:
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	1489 auto params = parseParameters();
102 6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	1490 // TODO: create FunctionType.
98 aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	1491 // new FunctionType(params);
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	1492 break;
100 538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	1493 default:
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	1494 break;
95 0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	1495 }
98 aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	1496 break;
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	1497 }
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	1498 return t;
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	1499 }
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	1500
106 441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	1501 Type parseArrayType(Type t)
441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	1502 {
441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	1503 assert(token.type == T.LBracket);
441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	1504 nT();
441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	1505 if (token.type == T.RBracket)
441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	1506 {
441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	1507 t = new ArrayType(t);
441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	1508 nT();
441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	1509 }
441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	1510 else
441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	1511 {
441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	1512 bool failed;
441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	1513 auto assocType = try_(parseType(), failed);
441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	1514 if (!failed)
441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	1515 t = new ArrayType(t, assocType);
441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	1516 else
441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	1517 {
441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	1518 Expression e = parseExpression(), e2;
441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	1519 if (token.type == T.Slice)
441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	1520 {
441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	1521 nT();
441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	1522 e2 = parseExpression();
441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	1523 }
441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	1524 t = new ArrayType(t, e, e2);
441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	1525 }
441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	1526 require(T.RBracket);
441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	1527 }
441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	1528 return t;
441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	1529 }
441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	1530
100 538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	1531 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	1532 {
104 b535016f8c3f - DeclaratorSuffix must be parsed after an Identifier. aziz parents: 103 diff changeset	1533 auto t = parseType();
98 aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	1534
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	1535 if (token.type == T.Identifier)
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	1536 {
107 722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	1537 ident = token.identifier;
95 0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	1538 nT();
104 b535016f8c3f - DeclaratorSuffix must be parsed after an Identifier. aziz parents: 103 diff changeset	1539 t = parseDeclaratorSuffix(t);
95 0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	1540 }
100 538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	1541 else if (!identOptional)
124 d4c4cea6ee7f - Renamed method errorIfNot() to expected(). aziz parents: 123 diff changeset	1542 expected(T.Identifier);
98 aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	1543
104 b535016f8c3f - DeclaratorSuffix must be parsed after an Identifier. aziz parents: 103 diff changeset	1544 return t;
95 0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	1545 }
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	1546
117 79857de26e86 - Moved class Parameter to module Types. Added struct Parameters. aziz parents: 116 diff changeset	1547 Parameters parseParameters()
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters. aziz parents: 116 diff changeset	1548 out(params)
96 d12d31d5fc17 - Added out-contract to parseParameters(). aziz parents: 95 diff changeset	1549 {
117 79857de26e86 - Moved class Parameter to module Types. Added struct Parameters. aziz parents: 116 diff changeset	1550 if (params.length > 1)
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters. aziz parents: 116 diff changeset	1551 foreach (param; params.items[0..$-1])
96 d12d31d5fc17 - Added out-contract to parseParameters(). aziz parents: 95 diff changeset	1552 {
117 79857de26e86 - Moved class Parameter to module Types. Added struct Parameters. aziz parents: 116 diff changeset	1553 if (param.isVariadic())
96 d12d31d5fc17 - Added out-contract to parseParameters(). aziz parents: 95 diff changeset	1554 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	1555 }
d12d31d5fc17 - Added out-contract to parseParameters(). aziz parents: 95 diff changeset	1556 }
d12d31d5fc17 - Added out-contract to parseParameters(). aziz parents: 95 diff changeset	1557 body
95 0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	1558 {
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	1559 require(T.LParen);
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	1560
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	1561 if (token.type == T.RParen)
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	1562 {
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	1563 nT();
117 79857de26e86 - Moved class Parameter to module Types. Added struct Parameters. aziz parents: 116 diff changeset	1564 return Parameters.init;
95 0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	1565 }
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	1566
117 79857de26e86 - Moved class Parameter to module Types. Added struct Parameters. aziz parents: 116 diff changeset	1567 Parameters params;
95 0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	1568 StorageClass stc;
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	1569
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	1570 while (1)
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	1571 {
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	1572 stc = StorageClass.In;
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	1573 switch (token.type)
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	1574 {
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	1575 case T.In: stc = StorageClass.In; nT(); goto default;
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	1576 case T.Out: stc = StorageClass.Out; nT(); goto default;
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	1577 case T.Ref: stc = StorageClass.Ref; nT(); goto default;
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	1578 case T.Lazy: stc = StorageClass.Lazy; nT(); goto default;
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	1579 case T.Ellipses:
117 79857de26e86 - Moved class Parameter to module Types. Added struct Parameters. aziz parents: 116 diff changeset	1580 params ~= new Parameter(StorageClass.Variadic, null, null, null);
95 0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	1581 break;
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	1582 default:
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	1583 string ident;
130 0467f01ed524 - Fix: parameters can have optional identifier. aziz parents: 129 diff changeset	1584 auto type = parseDeclarator(ident, true);
99 6b8c248f5911 - Added member type to classes CastExpression and TypeidExpression. aziz parents: 98 diff changeset	1585
95 0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	1586 Expression assignExpr;
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	1587 if (token.type == T.Assign)
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	1588 {
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	1589 nT();
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	1590 assignExpr = parseAssignExpression();
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	1591 }
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	1592
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	1593 if (token.type == T.Ellipses)
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	1594 {
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	1595 stc \|= StorageClass.Variadic;
117 79857de26e86 - Moved class Parameter to module Types. Added struct Parameters. aziz parents: 116 diff changeset	1596 params ~= new Parameter(stc, type, ident, assignExpr);
95 0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	1597 nT();
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	1598 break;
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	1599 }
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	1600
117 79857de26e86 - Moved class Parameter to module Types. Added struct Parameters. aziz parents: 116 diff changeset	1601 params ~= new Parameter(stc, type, ident, assignExpr);
95 0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	1602 if (token.type == T.Comma)
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	1603 {
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	1604 nT();
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	1605 continue;
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	1606 }
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	1607 break;
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	1608 }
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	1609 break;
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	1610 }
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	1611 require(T.RParen);
117 79857de26e86 - Moved class Parameter to module Types. Added struct Parameters. aziz parents: 116 diff changeset	1612 return params;
95 0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	1613 }
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	1614
124 d4c4cea6ee7f - Renamed method errorIfNot() to expected(). aziz parents: 123 diff changeset	1615 void expected(TOK tok)
86 0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	1616 {
87 c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	1617 if (token.type != tok)
c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	1618 error(MID.ExpectedButFound, tok, token.srcText);
86 0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	1619 }
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	1620
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	1621 void require(TOK tok)
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	1622 {
87 c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	1623 if (token.type == tok)
86 0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	1624 nT();
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	1625 else
87 c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	1626 error(MID.ExpectedButFound, tok, token.srcText);
86 0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	1627 }
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	1628
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	1629 void requireNext(TOK tok)
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	1630 {
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	1631 nT();
87 c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	1632 if (token.type == tok)
86 0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	1633 nT();
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	1634 else
87 c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	1635 error(MID.ExpectedButFound, tok, token.srcText);
86 0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	1636 }
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	1637
115 cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier(). aziz parents: 114 diff changeset	1638 string requireIdentifier()
cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier(). aziz parents: 114 diff changeset	1639 {
cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier(). aziz parents: 114 diff changeset	1640 string identifier;
cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier(). aziz parents: 114 diff changeset	1641 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	1642 {
cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier(). aziz parents: 114 diff changeset	1643 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	1644 nT();
cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier(). aziz parents: 114 diff changeset	1645 }
cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier(). aziz parents: 114 diff changeset	1646 else
cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier(). aziz parents: 114 diff changeset	1647 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	1648 return identifier;
cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier(). aziz parents: 114 diff changeset	1649 }
cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier(). aziz parents: 114 diff changeset	1650
71 b3777cca323c - Added Identity and NotIdentity tokens. aziz parents: 70 diff changeset	1651 void error(MID id, ...)
b3777cca323c - Added Identity and NotIdentity tokens. aziz parents: 70 diff changeset	1652 {
94 0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	1653 errors ~= new Information(InfoType.Parser, id, lx.loc, arguments(_arguments, _argptr));
71 b3777cca323c - Added Identity and NotIdentity tokens. aziz parents: 70 diff changeset	1654 }
65 6c21ae79fbb3 - Renamed function Token.span to Token.srcText. aziz parents: 0 diff changeset	1655 }

Mercurial > projects > dil

annotate trunk/src/Parser.d @ 130:0467f01ed524