Mercurial > projects > dil

annotate trunk/src/Parser.d @ 169:4666a05dfacf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
- Implemented parseForeachStatement().
author aziz
date Sat, 14 Jul 2007 09:34:04 +0000
parents fbbb2434bf6b
children a63696d1c474
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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 {
132
c97a3f683d13 - Skipping comments in nT().
aziz
parents: 131
diff changeset
31 do
c97a3f683d13 - Skipping comments in nT().
aziz
parents: 131
diff changeset
32 {
c97a3f683d13 - Skipping comments in nT().
aziz
parents: 131
diff changeset
33 lx.nextToken();
c97a3f683d13 - Skipping comments in nT().
aziz
parents: 131
diff changeset
34 token = &lx.token;
c97a3f683d13 - Skipping comments in nT().
aziz
parents: 131
diff changeset
35 } while (token.type == T.Comment) // Skip comments
71
b3777cca323c - Added Identity and NotIdentity tokens.
aziz
parents: 70
diff changeset
36 }
70
0d3ef6daec04 - Added Expression class stubs.
aziz
parents: 69
diff changeset
37
102
6e8b67ae15b7 - Added modules Declarations and Statements.
aziz
parents: 101
diff changeset
38 void skipToOnePast(TOK tok)
6e8b67ae15b7 - Added modules Declarations and Statements.
aziz
parents: 101
diff changeset
39 {
6e8b67ae15b7 - Added modules Declarations and Statements.
aziz
parents: 101
diff changeset
40 for (; token.type != tok && token.type != T.EOF; nT())
6e8b67ae15b7 - Added modules Declarations and Statements.
aziz
parents: 101
diff changeset
41 {}
6e8b67ae15b7 - Added modules Declarations and Statements.
aziz
parents: 101
diff changeset
42 nT();
6e8b67ae15b7 - Added modules Declarations and Statements.
aziz
parents: 101
diff changeset
43 }
105
df34ec47fb81 - Added getState() method and State struct to Lexer.
aziz
parents: 104
diff changeset
44
106
441962b0f526 - Added parseArrayType() method.
aziz
parents: 105
diff changeset
45 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
46 {
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
47 auto len = errors.length;
105
df34ec47fb81 - Added getState() method and State struct to Lexer.
aziz
parents: 104
diff changeset
48 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
49 auto result = parseMethod();
105
df34ec47fb81 - Added getState() method and State struct to Lexer.
aziz
parents: 104
diff changeset
50 // 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
51 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
52 {
105
df34ec47fb81 - Added getState() method and State struct to Lexer.
aziz
parents: 104
diff changeset
53 lexerState.restore(); // Restore state of the Lexer object.
df34ec47fb81 - Added getState() method and State struct to Lexer.
aziz
parents: 104
diff changeset
54 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
55 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
56 }
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
57 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
58 }
105
df34ec47fb81 - Added getState() method and State struct to Lexer.
aziz
parents: 104
diff changeset
59
102
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 parsing methods +
6e8b67ae15b7 - Added modules Declarations and Statements.
aziz
parents: 101
diff changeset
62 ++++++++++++++++++++++++++++++/
6e8b67ae15b7 - Added modules Declarations and Statements.
aziz
parents: 101
diff changeset
63
6e8b67ae15b7 - Added modules Declarations and Statements.
aziz
parents: 101
diff changeset
64 Declaration[] parseModule()
6e8b67ae15b7 - Added modules Declarations and Statements.
aziz
parents: 101
diff changeset
65 {
6e8b67ae15b7 - Added modules Declarations and Statements.
aziz
parents: 101
diff changeset
66 Declaration[] decls;
6e8b67ae15b7 - Added modules Declarations and Statements.
aziz
parents: 101
diff changeset
67
6e8b67ae15b7 - Added modules Declarations and Statements.
aziz
parents: 101
diff changeset
68 if (token.type == T.Module)
6e8b67ae15b7 - Added modules Declarations and Statements.
aziz
parents: 101
diff changeset
69 {
115
cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier().
aziz
parents: 114
diff changeset
70 ModuleName moduleName;
102
6e8b67ae15b7 - Added modules Declarations and Statements.
aziz
parents: 101
diff changeset
71 do
6e8b67ae15b7 - Added modules Declarations and Statements.
aziz
parents: 101
diff changeset
72 {
6e8b67ae15b7 - Added modules Declarations and Statements.
aziz
parents: 101
diff changeset
73 nT();
115
cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier().
aziz
parents: 114
diff changeset
74 moduleName ~= requireIdentifier();
102
6e8b67ae15b7 - Added modules Declarations and Statements.
aziz
parents: 101
diff changeset
75 } while (token.type == T.Dot)
6e8b67ae15b7 - Added modules Declarations and Statements.
aziz
parents: 101
diff changeset
76 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
77 decls ~= new ModuleDeclaration(moduleName);
102
6e8b67ae15b7 - Added modules Declarations and Statements.
aziz
parents: 101
diff changeset
78 }
110
2fb631daaaae - Renamed methods.
aziz
parents: 109
diff changeset
79 decls ~= parseDeclarationDefinitions();
102
6e8b67ae15b7 - Added modules Declarations and Statements.
aziz
parents: 101
diff changeset
80 return decls;
6e8b67ae15b7 - Added modules Declarations and Statements.
aziz
parents: 101
diff changeset
81 }
6e8b67ae15b7 - Added modules Declarations and Statements.
aziz
parents: 101
diff changeset
82
110
2fb631daaaae - Renamed methods.
aziz
parents: 109
diff changeset
83 Declaration[] parseDeclarationDefinitions()
102
6e8b67ae15b7 - Added modules Declarations and Statements.
aziz
parents: 101
diff changeset
84 {
6e8b67ae15b7 - Added modules Declarations and Statements.
aziz
parents: 101
diff changeset
85 Declaration[] decls;
122
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
86 while (token.type != T.RBrace && token.type != T.EOF)
161
82c5cfc7d6d3 - Started implementation of parsing statements.
aziz
parents: 160
diff changeset
87 decls ~= parseDeclarationDefinition();
102
6e8b67ae15b7 - Added modules Declarations and Statements.
aziz
parents: 101
diff changeset
88 return decls;
6e8b67ae15b7 - Added modules Declarations and Statements.
aziz
parents: 101
diff changeset
89 }
6e8b67ae15b7 - Added modules Declarations and Statements.
aziz
parents: 101
diff changeset
90
110
2fb631daaaae - Renamed methods.
aziz
parents: 109
diff changeset
91 Declaration parseDeclarationDefinition()
102
6e8b67ae15b7 - Added modules Declarations and Statements.
aziz
parents: 101
diff changeset
92 {
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
93 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
94 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
95 {
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 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
97 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
98 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
99 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
100 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
101 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
102 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
103 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
104 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
105 //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
106 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
107 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
108 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
109 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
110 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
111 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
112 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
113 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
114 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
115 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
116 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
117 lx.peek(t);
119
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration().
aziz
parents: 118
diff changeset
118
125
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration.
aziz
parents: 124
diff changeset
119 switch (t.type)
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration.
aziz
parents: 124
diff changeset
120 {
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration.
aziz
parents: 124
diff changeset
121 case T.Import:
119
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration().
aziz
parents: 118
diff changeset
122 goto case T.Import;
125
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration.
aziz
parents: 124
diff changeset
123 case T.This:
119
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration().
aziz
parents: 118
diff changeset
124 decl = parseStaticConstructorDeclaration();
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.Tilde:
119
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration().
aziz
parents: 118
diff changeset
127 decl = parseStaticDestructorDeclaration();
125
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration.
aziz
parents: 124
diff changeset
128 break;
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration.
aziz
parents: 124
diff changeset
129 case T.If:
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration.
aziz
parents: 124
diff changeset
130 decl = parseStaticIfDeclaration();
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration.
aziz
parents: 124
diff changeset
131 break;
127
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration.
aziz
parents: 126
diff changeset
132 case T.Assert:
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration.
aziz
parents: 126
diff changeset
133 decl = parseStaticAssertDeclaration();
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration.
aziz
parents: 126
diff changeset
134 break;
125
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration.
aziz
parents: 124
diff changeset
135 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
136 goto case_AttributeSpecifier;
125
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration.
aziz
parents: 124
diff changeset
137 }
119
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration().
aziz
parents: 118
diff changeset
138 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
139 case T.Import:
107
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration.
aziz
parents: 106
diff changeset
140 decl = parseImportDeclaration();
109
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses().
aziz
parents: 108
diff changeset
141 break;
107
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration.
aziz
parents: 106
diff changeset
142 case T.Enum:
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration.
aziz
parents: 106
diff changeset
143 decl = parseEnumDeclaration();
109
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses().
aziz
parents: 108
diff changeset
144 break;
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses().
aziz
parents: 108
diff changeset
145 case T.Class:
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses().
aziz
parents: 108
diff changeset
146 decl = parseClassDeclaration();
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses().
aziz
parents: 108
diff changeset
147 break;
112
004d98df65af - Implemented parseInterfaceDeclaration().
aziz
parents: 111
diff changeset
148 case T.Interface:
004d98df65af - Implemented parseInterfaceDeclaration().
aziz
parents: 111
diff changeset
149 decl = parseInterfaceDeclaration();
004d98df65af - Implemented parseInterfaceDeclaration().
aziz
parents: 111
diff changeset
150 break;
113
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations.
aziz
parents: 112
diff changeset
151 case T.Struct, T.Union:
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations.
aziz
parents: 112
diff changeset
152 decl = parseAggregateDeclaration();
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations.
aziz
parents: 112
diff changeset
153 break;
117
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters.
aziz
parents: 116
diff changeset
154 case T.This:
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters.
aziz
parents: 116
diff changeset
155 decl = parseConstructorDeclaration();
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters.
aziz
parents: 116
diff changeset
156 break;
118
379f33cbd521 - Added parseDestructorDeclaration() and DestructorDeclaration class.
aziz
parents: 117
diff changeset
157 case T.Tilde:
379f33cbd521 - Added parseDestructorDeclaration() and DestructorDeclaration class.
aziz
parents: 117
diff changeset
158 decl = parseDestructorDeclaration();
379f33cbd521 - Added parseDestructorDeclaration() and DestructorDeclaration class.
aziz
parents: 117
diff changeset
159 break;
120
e5329dac0405 - Added parseInvariantDeclaration().
aziz
parents: 119
diff changeset
160 case T.Invariant:
e5329dac0405 - Added parseInvariantDeclaration().
aziz
parents: 119
diff changeset
161 decl = parseInvariantDeclaration();
e5329dac0405 - Added parseInvariantDeclaration().
aziz
parents: 119
diff changeset
162 break;
121
030933c6b5f0 - Added parseUnittestDeclaration().
aziz
parents: 120
diff changeset
163 case T.Unittest:
030933c6b5f0 - Added parseUnittestDeclaration().
aziz
parents: 120
diff changeset
164 decl = parseUnittestDeclaration();
030933c6b5f0 - Added parseUnittestDeclaration().
aziz
parents: 120
diff changeset
165 break;
122
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
166 case T.Debug:
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
167 decl = parseDebugDeclaration();
140
64d7186b087c - Implemented parseTemplateParameters().
aziz
parents: 139
diff changeset
168 break;
146
8180eb84e69c - Started implementation of parseAttributeSpecifier().
aziz
parents: 145
diff changeset
169 case T.Version:
8180eb84e69c - Started implementation of parseAttributeSpecifier().
aziz
parents: 145
diff changeset
170 decl = parseVersionDeclaration();
8180eb84e69c - Started implementation of parseAttributeSpecifier().
aziz
parents: 145
diff changeset
171 break;
140
64d7186b087c - Implemented parseTemplateParameters().
aziz
parents: 139
diff changeset
172 case T.Template:
64d7186b087c - Implemented parseTemplateParameters().
aziz
parents: 139
diff changeset
173 decl = parseTemplateDeclaration();
64d7186b087c - Implemented parseTemplateParameters().
aziz
parents: 139
diff changeset
174 break;
141
7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration().
aziz
parents: 140
diff changeset
175 case T.New:
7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration().
aziz
parents: 140
diff changeset
176 decl = parseNewDeclaration();
7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration().
aziz
parents: 140
diff changeset
177 break;
7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration().
aziz
parents: 140
diff changeset
178 case T.Delete:
7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration().
aziz
parents: 140
diff changeset
179 decl = parseDeleteDeclaration();
7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration().
aziz
parents: 140
diff changeset
180 break;
146
8180eb84e69c - Started implementation of parseAttributeSpecifier().
aziz
parents: 145
diff changeset
181 case T.Mixin:
150
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument.
aziz
parents: 149
diff changeset
182 decl = parseMixinDeclaration();
146
8180eb84e69c - Started implementation of parseAttributeSpecifier().
aziz
parents: 145
diff changeset
183 break;
129
a9244d409652 - Added class EmptyDeclaration.
aziz
parents: 128
diff changeset
184 case T.Semicolon:
a9244d409652 - Added class EmptyDeclaration.
aziz
parents: 128
diff changeset
185 nT();
a9244d409652 - Added class EmptyDeclaration.
aziz
parents: 128
diff changeset
186 decl = new EmptyDeclaration();
a9244d409652 - Added class EmptyDeclaration.
aziz
parents: 128
diff changeset
187 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
188 case T.Module:
150
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument.
aziz
parents: 149
diff changeset
189 // TODO: 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
190 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
191 default:
150
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument.
aziz
parents: 149
diff changeset
192 // TODO: issue error msg.
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
193 }
129
a9244d409652 - Added class EmptyDeclaration.
aziz
parents: 128
diff changeset
194 return decl;
102
6e8b67ae15b7 - Added modules Declarations and Statements.
aziz
parents: 101
diff changeset
195 }
6e8b67ae15b7 - Added modules Declarations and Statements.
aziz
parents: 101
diff changeset
196
122
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
197 /*
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
198 DeclarationsBlock:
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
199 : DeclDefs
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
200 { }
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
201 { DeclDefs }
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
202 DeclDef
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
203 */
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
204 Declaration[] parseDeclarationsBlock()
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
205 {
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
206 Declaration[] decls;
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
207 switch (token.type)
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
208 {
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
209 case T.LBrace:
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
210 nT();
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
211 if (token.type == T.RBrace)
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
212 nT();
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
213 else
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
214 {
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
215 decls = parseDeclarationDefinitions();
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
216 require(T.RBrace);
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
217 }
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
218 break;
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
219 case T.Colon:
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
220 nT();
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
221 decls = parseDeclarationDefinitions();
123
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
222 assert(token.type == T.RBrace || token.type == T.EOF);
122
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
223 break;
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
224 default:
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
225 decls ~= parseDeclarationDefinition();
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
226 }
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
227 return decls;
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
228 }
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
229
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
230 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
231 {
146
8180eb84e69c - Started implementation of parseAttributeSpecifier().
aziz
parents: 145
diff changeset
232 Declaration decl;
8180eb84e69c - Started implementation of parseAttributeSpecifier().
aziz
parents: 145
diff changeset
233
8180eb84e69c - Started implementation of parseAttributeSpecifier().
aziz
parents: 145
diff changeset
234 switch (token.type)
8180eb84e69c - Started implementation of parseAttributeSpecifier().
aziz
parents: 145
diff changeset
235 {
8180eb84e69c - Started implementation of parseAttributeSpecifier().
aziz
parents: 145
diff changeset
236 case T.Extern:
8180eb84e69c - Started implementation of parseAttributeSpecifier().
aziz
parents: 145
diff changeset
237 nT();
159
5aa877506db0 - Added enum Linkage.
aziz
parents: 158
diff changeset
238 Linkage linkage;
146
8180eb84e69c - Started implementation of parseAttributeSpecifier().
aziz
parents: 145
diff changeset
239 if (token.type == T.LParen)
8180eb84e69c - Started implementation of parseAttributeSpecifier().
aziz
parents: 145
diff changeset
240 {
8180eb84e69c - Started implementation of parseAttributeSpecifier().
aziz
parents: 145
diff changeset
241 nT();
159
5aa877506db0 - Added enum Linkage.
aziz
parents: 158
diff changeset
242 auto ident = requireIdentifier();
5aa877506db0 - Added enum Linkage.
aziz
parents: 158
diff changeset
243 switch (ident)
5aa877506db0 - Added enum Linkage.
aziz
parents: 158
diff changeset
244 {
5aa877506db0 - Added enum Linkage.
aziz
parents: 158
diff changeset
245 case "C":
5aa877506db0 - Added enum Linkage.
aziz
parents: 158
diff changeset
246 if (token.type == T.PlusPlus)
5aa877506db0 - Added enum Linkage.
aziz
parents: 158
diff changeset
247 {
5aa877506db0 - Added enum Linkage.
aziz
parents: 158
diff changeset
248 nT();
5aa877506db0 - Added enum Linkage.
aziz
parents: 158
diff changeset
249 linkage = Linkage.Cpp;
5aa877506db0 - Added enum Linkage.
aziz
parents: 158
diff changeset
250 break;
5aa877506db0 - Added enum Linkage.
aziz
parents: 158
diff changeset
251 }
5aa877506db0 - Added enum Linkage.
aziz
parents: 158
diff changeset
252 linkage = Linkage.C;
5aa877506db0 - Added enum Linkage.
aziz
parents: 158
diff changeset
253 break;
5aa877506db0 - Added enum Linkage.
aziz
parents: 158
diff changeset
254 case "D":
5aa877506db0 - Added enum Linkage.
aziz
parents: 158
diff changeset
255 linkage = Linkage.D;
5aa877506db0 - Added enum Linkage.
aziz
parents: 158
diff changeset
256 break;
5aa877506db0 - Added enum Linkage.
aziz
parents: 158
diff changeset
257 case "Windows":
5aa877506db0 - Added enum Linkage.
aziz
parents: 158
diff changeset
258 linkage = Linkage.Windows;
5aa877506db0 - Added enum Linkage.
aziz
parents: 158
diff changeset
259 break;
5aa877506db0 - Added enum Linkage.
aziz
parents: 158
diff changeset
260 case "Pascal":
5aa877506db0 - Added enum Linkage.
aziz
parents: 158
diff changeset
261 linkage = Linkage.Pascal;
5aa877506db0 - Added enum Linkage.
aziz
parents: 158
diff changeset
262 break;
5aa877506db0 - Added enum Linkage.
aziz
parents: 158
diff changeset
263 default:
5aa877506db0 - Added enum Linkage.
aziz
parents: 158
diff changeset
264 // TODO: issue error msg. Unrecognized LinkageType.
5aa877506db0 - Added enum Linkage.
aziz
parents: 158
diff changeset
265 }
146
8180eb84e69c - Started implementation of parseAttributeSpecifier().
aziz
parents: 145
diff changeset
266 require(T.RParen);
8180eb84e69c - Started implementation of parseAttributeSpecifier().
aziz
parents: 145
diff changeset
267 }
8180eb84e69c - Started implementation of parseAttributeSpecifier().
aziz
parents: 145
diff changeset
268 decl = new ExternDeclaration(linkage, parseDeclarationsBlock());
8180eb84e69c - Started implementation of parseAttributeSpecifier().
aziz
parents: 145
diff changeset
269 break;
8180eb84e69c - Started implementation of parseAttributeSpecifier().
aziz
parents: 145
diff changeset
270 case T.Align:
8180eb84e69c - Started implementation of parseAttributeSpecifier().
aziz
parents: 145
diff changeset
271 nT();
8180eb84e69c - Started implementation of parseAttributeSpecifier().
aziz
parents: 145
diff changeset
272 int size = -1;
8180eb84e69c - Started implementation of parseAttributeSpecifier().
aziz
parents: 145
diff changeset
273 if (token.type == T.LParen)
8180eb84e69c - Started implementation of parseAttributeSpecifier().
aziz
parents: 145
diff changeset
274 {
8180eb84e69c - Started implementation of parseAttributeSpecifier().
aziz
parents: 145
diff changeset
275 nT();
8180eb84e69c - Started implementation of parseAttributeSpecifier().
aziz
parents: 145
diff changeset
276 if (token.type == T.Int32)
8180eb84e69c - Started implementation of parseAttributeSpecifier().
aziz
parents: 145
diff changeset
277 {
8180eb84e69c - Started implementation of parseAttributeSpecifier().
aziz
parents: 145
diff changeset
278 size = token.int_;
8180eb84e69c - Started implementation of parseAttributeSpecifier().
aziz
parents: 145
diff changeset
279 nT();
8180eb84e69c - Started implementation of parseAttributeSpecifier().
aziz
parents: 145
diff changeset
280 }
8180eb84e69c - Started implementation of parseAttributeSpecifier().
aziz
parents: 145
diff changeset
281 else
8180eb84e69c - Started implementation of parseAttributeSpecifier().
aziz
parents: 145
diff changeset
282 expected(T.Int32);
8180eb84e69c - Started implementation of parseAttributeSpecifier().
aziz
parents: 145
diff changeset
283 require(T.RParen);
8180eb84e69c - Started implementation of parseAttributeSpecifier().
aziz
parents: 145
diff changeset
284 }
8180eb84e69c - Started implementation of parseAttributeSpecifier().
aziz
parents: 145
diff changeset
285 decl = new AlignDeclaration(size, parseDeclarationsBlock());
8180eb84e69c - Started implementation of parseAttributeSpecifier().
aziz
parents: 145
diff changeset
286 break;
8180eb84e69c - Started implementation of parseAttributeSpecifier().
aziz
parents: 145
diff changeset
287 case T.Pragma:
147
e46b3415ec16 - Implemented parsing pragma declarations.
aziz
parents: 146
diff changeset
288 // Pragma:
e46b3415ec16 - Implemented parsing pragma declarations.
aziz
parents: 146
diff changeset
289 // pragma ( Identifier )
e46b3415ec16 - Implemented parsing pragma declarations.
aziz
parents: 146
diff changeset
290 // pragma ( Identifier , ExpressionList )
e46b3415ec16 - Implemented parsing pragma declarations.
aziz
parents: 146
diff changeset
291 // ExpressionList:
e46b3415ec16 - Implemented parsing pragma declarations.
aziz
parents: 146
diff changeset
292 // AssignExpression
e46b3415ec16 - Implemented parsing pragma declarations.
aziz
parents: 146
diff changeset
293 // AssignExpression , ExpressionList
e46b3415ec16 - Implemented parsing pragma declarations.
aziz
parents: 146
diff changeset
294 nT();
e46b3415ec16 - Implemented parsing pragma declarations.
aziz
parents: 146
diff changeset
295 string ident;
e46b3415ec16 - Implemented parsing pragma declarations.
aziz
parents: 146
diff changeset
296 Expression[] args;
e46b3415ec16 - Implemented parsing pragma declarations.
aziz
parents: 146
diff changeset
297 Declaration[] decls;
e46b3415ec16 - Implemented parsing pragma declarations.
aziz
parents: 146
diff changeset
298
e46b3415ec16 - Implemented parsing pragma declarations.
aziz
parents: 146
diff changeset
299 require(T.LParen);
e46b3415ec16 - Implemented parsing pragma declarations.
aziz
parents: 146
diff changeset
300 ident = requireIdentifier();
e46b3415ec16 - Implemented parsing pragma declarations.
aziz
parents: 146
diff changeset
301
e46b3415ec16 - Implemented parsing pragma declarations.
aziz
parents: 146
diff changeset
302 if (token.type == T.Comma)
e46b3415ec16 - Implemented parsing pragma declarations.
aziz
parents: 146
diff changeset
303 args = parseArguments(T.RParen);
e46b3415ec16 - Implemented parsing pragma declarations.
aziz
parents: 146
diff changeset
304 else
e46b3415ec16 - Implemented parsing pragma declarations.
aziz
parents: 146
diff changeset
305 require(T.RParen);
e46b3415ec16 - Implemented parsing pragma declarations.
aziz
parents: 146
diff changeset
306
e46b3415ec16 - Implemented parsing pragma declarations.
aziz
parents: 146
diff changeset
307 if (token.type == T.Semicolon)
e46b3415ec16 - Implemented parsing pragma declarations.
aziz
parents: 146
diff changeset
308 nT();
e46b3415ec16 - Implemented parsing pragma declarations.
aziz
parents: 146
diff changeset
309 else
e46b3415ec16 - Implemented parsing pragma declarations.
aziz
parents: 146
diff changeset
310 decls = parseDeclarationsBlock();
e46b3415ec16 - Implemented parsing pragma declarations.
aziz
parents: 146
diff changeset
311
e46b3415ec16 - Implemented parsing pragma declarations.
aziz
parents: 146
diff changeset
312 decl = new PragmaDeclaration(ident, args, decls);
e46b3415ec16 - Implemented parsing pragma declarations.
aziz
parents: 146
diff changeset
313 break;
149
37e2e0d06013 - Removed ProtectionDeclaration.
aziz
parents: 148
diff changeset
314 // Protection attributes
146
8180eb84e69c - Started implementation of parseAttributeSpecifier().
aziz
parents: 145
diff changeset
315 case T.Private:
8180eb84e69c - Started implementation of parseAttributeSpecifier().
aziz
parents: 145
diff changeset
316 case T.Package:
8180eb84e69c - Started implementation of parseAttributeSpecifier().
aziz
parents: 145
diff changeset
317 case T.Protected:
8180eb84e69c - Started implementation of parseAttributeSpecifier().
aziz
parents: 145
diff changeset
318 case T.Public:
148
e3e4d3314166 - Implemented parsing protection attributes.
aziz
parents: 147
diff changeset
319 case T.Export:
149
37e2e0d06013 - Removed ProtectionDeclaration.
aziz
parents: 148
diff changeset
320 // StorageClass attributes
146
8180eb84e69c - Started implementation of parseAttributeSpecifier().
aziz
parents: 145
diff changeset
321 case T.Override:
8180eb84e69c - Started implementation of parseAttributeSpecifier().
aziz
parents: 145
diff changeset
322 case T.Deprecated:
8180eb84e69c - Started implementation of parseAttributeSpecifier().
aziz
parents: 145
diff changeset
323 case T.Abstract:
8180eb84e69c - Started implementation of parseAttributeSpecifier().
aziz
parents: 145
diff changeset
324 case T.Static:
8180eb84e69c - Started implementation of parseAttributeSpecifier().
aziz
parents: 145
diff changeset
325 case T.Final:
8180eb84e69c - Started implementation of parseAttributeSpecifier().
aziz
parents: 145
diff changeset
326 case T.Const:
8180eb84e69c - Started implementation of parseAttributeSpecifier().
aziz
parents: 145
diff changeset
327 case T.Auto:
8180eb84e69c - Started implementation of parseAttributeSpecifier().
aziz
parents: 145
diff changeset
328 case T.Scope:
150
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument.
aziz
parents: 149
diff changeset
329 nT();
149
37e2e0d06013 - Removed ProtectionDeclaration.
aziz
parents: 148
diff changeset
330 decl = new AttributeDeclaration(token.type, parseDeclarationsBlock());
37e2e0d06013 - Removed ProtectionDeclaration.
aziz
parents: 148
diff changeset
331 break;
146
8180eb84e69c - Started implementation of parseAttributeSpecifier().
aziz
parents: 145
diff changeset
332 default:
8180eb84e69c - Started implementation of parseAttributeSpecifier().
aziz
parents: 145
diff changeset
333 assert(0);
8180eb84e69c - Started implementation of parseAttributeSpecifier().
aziz
parents: 145
diff changeset
334 }
8180eb84e69c - Started implementation of parseAttributeSpecifier().
aziz
parents: 145
diff changeset
335 return decl;
103
511a1aa25896 - Added reportErrors member to Lexer. Moved peek() down and rewrote it a bit making use of reportErrors. error() uses reportErrors too.
aziz
parents: 102
diff changeset
336 }
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
337
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
338 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
339 {
107
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration.
aziz
parents: 106
diff changeset
340 assert(token.type == T.Import || token.type == T.Static);
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration.
aziz
parents: 106
diff changeset
341
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
342 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
343 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
344
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
345 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
346 {
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
347 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
348 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
349 }
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
350
114
83bb5190c0fc - Completed implementation of parseImportDeclaration().
aziz
parents: 113
diff changeset
351 ModuleName[] moduleNames;
83bb5190c0fc - Completed implementation of parseImportDeclaration().
aziz
parents: 113
diff changeset
352 string[] moduleAliases;
83bb5190c0fc - Completed implementation of parseImportDeclaration().
aziz
parents: 113
diff changeset
353 string[] bindNames;
83bb5190c0fc - Completed implementation of parseImportDeclaration().
aziz
parents: 113
diff changeset
354 string[] bindAliases;
83bb5190c0fc - Completed implementation of parseImportDeclaration().
aziz
parents: 113
diff changeset
355
115
cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier().
aziz
parents: 114
diff changeset
356 nT(); // Skip import keyword.
114
83bb5190c0fc - Completed implementation of parseImportDeclaration().
aziz
parents: 113
diff changeset
357 do
83bb5190c0fc - Completed implementation of parseImportDeclaration().
aziz
parents: 113
diff changeset
358 {
83bb5190c0fc - Completed implementation of parseImportDeclaration().
aziz
parents: 113
diff changeset
359 ModuleName moduleName;
83bb5190c0fc - Completed implementation of parseImportDeclaration().
aziz
parents: 113
diff changeset
360 string moduleAlias;
83bb5190c0fc - Completed implementation of parseImportDeclaration().
aziz
parents: 113
diff changeset
361
115
cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier().
aziz
parents: 114
diff changeset
362 moduleAlias = requireIdentifier();
cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier().
aziz
parents: 114
diff changeset
363
cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier().
aziz
parents: 114
diff changeset
364 // AliasName = ModuleName
cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier().
aziz
parents: 114
diff changeset
365 if (token.type == T.Assign)
114
83bb5190c0fc - Completed implementation of parseImportDeclaration().
aziz
parents: 113
diff changeset
366 {
83bb5190c0fc - Completed implementation of parseImportDeclaration().
aziz
parents: 113
diff changeset
367 nT();
115
cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier().
aziz
parents: 114
diff changeset
368 moduleName ~= requireIdentifier();
114
83bb5190c0fc - Completed implementation of parseImportDeclaration().
aziz
parents: 113
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 else // import Identifier [^=]
114
83bb5190c0fc - Completed implementation of parseImportDeclaration().
aziz
parents: 113
diff changeset
371 {
83bb5190c0fc - Completed implementation of parseImportDeclaration().
aziz
parents: 113
diff changeset
372 moduleName ~= moduleAlias;
83bb5190c0fc - Completed implementation of parseImportDeclaration().
aziz
parents: 113
diff changeset
373 moduleAlias = null;
83bb5190c0fc - Completed implementation of parseImportDeclaration().
aziz
parents: 113
diff changeset
374 }
115
cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier().
aziz
parents: 114
diff changeset
375
114
83bb5190c0fc - Completed implementation of parseImportDeclaration().
aziz
parents: 113
diff changeset
376
83bb5190c0fc - Completed implementation of parseImportDeclaration().
aziz
parents: 113
diff changeset
377 // parse Identifier(.Identifier)*
83bb5190c0fc - Completed implementation of parseImportDeclaration().
aziz
parents: 113
diff changeset
378 while (token.type == T.Dot)
83bb5190c0fc - Completed implementation of parseImportDeclaration().
aziz
parents: 113
diff changeset
379 {
83bb5190c0fc - Completed implementation of parseImportDeclaration().
aziz
parents: 113
diff changeset
380 nT();
115
cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier().
aziz
parents: 114
diff changeset
381 moduleName ~= requireIdentifier();
114
83bb5190c0fc - Completed implementation of parseImportDeclaration().
aziz
parents: 113
diff changeset
382 }
83bb5190c0fc - Completed implementation of parseImportDeclaration().
aziz
parents: 113
diff changeset
383
83bb5190c0fc - Completed implementation of parseImportDeclaration().
aziz
parents: 113
diff changeset
384 // Push identifiers.
83bb5190c0fc - Completed implementation of parseImportDeclaration().
aziz
parents: 113
diff changeset
385 moduleNames ~= moduleName;
83bb5190c0fc - Completed implementation of parseImportDeclaration().
aziz
parents: 113
diff changeset
386 moduleAliases ~= moduleAlias;
83bb5190c0fc - Completed implementation of parseImportDeclaration().
aziz
parents: 113
diff changeset
387
83bb5190c0fc - Completed implementation of parseImportDeclaration().
aziz
parents: 113
diff changeset
388 // parse : BindAlias = BindName(, BindAlias = BindName)*;
83bb5190c0fc - Completed implementation of parseImportDeclaration().
aziz
parents: 113
diff changeset
389 // : BindName(, BindName)*;
83bb5190c0fc - Completed implementation of parseImportDeclaration().
aziz
parents: 113
diff changeset
390 if (token.type == T.Colon)
83bb5190c0fc - Completed implementation of parseImportDeclaration().
aziz
parents: 113
diff changeset
391 {
83bb5190c0fc - Completed implementation of parseImportDeclaration().
aziz
parents: 113
diff changeset
392 string bindName, bindAlias;
83bb5190c0fc - Completed implementation of parseImportDeclaration().
aziz
parents: 113
diff changeset
393 do
83bb5190c0fc - Completed implementation of parseImportDeclaration().
aziz
parents: 113
diff changeset
394 {
83bb5190c0fc - Completed implementation of parseImportDeclaration().
aziz
parents: 113
diff changeset
395 nT();
115
cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier().
aziz
parents: 114
diff changeset
396 bindAlias = requireIdentifier();
114
83bb5190c0fc - Completed implementation of parseImportDeclaration().
aziz
parents: 113
diff changeset
397
83bb5190c0fc - Completed implementation of parseImportDeclaration().
aziz
parents: 113
diff changeset
398 if (token.type == T.Assign)
83bb5190c0fc - Completed implementation of parseImportDeclaration().
aziz
parents: 113
diff changeset
399 {
83bb5190c0fc - Completed implementation of parseImportDeclaration().
aziz
parents: 113
diff changeset
400 nT();
115
cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier().
aziz
parents: 114
diff changeset
401 bindName = requireIdentifier();
114
83bb5190c0fc - Completed implementation of parseImportDeclaration().
aziz
parents: 113
diff changeset
402 }
83bb5190c0fc - Completed implementation of parseImportDeclaration().
aziz
parents: 113
diff changeset
403 else
83bb5190c0fc - Completed implementation of parseImportDeclaration().
aziz
parents: 113
diff changeset
404 {
83bb5190c0fc - Completed implementation of parseImportDeclaration().
aziz
parents: 113
diff changeset
405 bindName = bindAlias;
83bb5190c0fc - Completed implementation of parseImportDeclaration().
aziz
parents: 113
diff changeset
406 bindAlias = null;
83bb5190c0fc - Completed implementation of parseImportDeclaration().
aziz
parents: 113
diff changeset
407 }
83bb5190c0fc - Completed implementation of parseImportDeclaration().
aziz
parents: 113
diff changeset
408
83bb5190c0fc - Completed implementation of parseImportDeclaration().
aziz
parents: 113
diff changeset
409 // Push identifiers.
83bb5190c0fc - Completed implementation of parseImportDeclaration().
aziz
parents: 113
diff changeset
410 bindNames ~= bindName;
83bb5190c0fc - Completed implementation of parseImportDeclaration().
aziz
parents: 113
diff changeset
411 bindAliases ~= bindAlias;
83bb5190c0fc - Completed implementation of parseImportDeclaration().
aziz
parents: 113
diff changeset
412
83bb5190c0fc - Completed implementation of parseImportDeclaration().
aziz
parents: 113
diff changeset
413 } while (token.type == T.Comma)
83bb5190c0fc - Completed implementation of parseImportDeclaration().
aziz
parents: 113
diff changeset
414 break;
83bb5190c0fc - Completed implementation of parseImportDeclaration().
aziz
parents: 113
diff changeset
415 }
83bb5190c0fc - Completed implementation of parseImportDeclaration().
aziz
parents: 113
diff changeset
416 } while (token.type == T.Comma)
83bb5190c0fc - Completed implementation of parseImportDeclaration().
aziz
parents: 113
diff changeset
417 require(T.Semicolon);
83bb5190c0fc - Completed implementation of parseImportDeclaration().
aziz
parents: 113
diff changeset
418
83bb5190c0fc - Completed implementation of parseImportDeclaration().
aziz
parents: 113
diff changeset
419 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
420 }
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
421
107
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration.
aziz
parents: 106
diff changeset
422 Declaration parseEnumDeclaration()
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration.
aziz
parents: 106
diff changeset
423 {
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration.
aziz
parents: 106
diff changeset
424 assert(token.type == T.Enum);
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration.
aziz
parents: 106
diff changeset
425
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration.
aziz
parents: 106
diff changeset
426 string enumName;
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration.
aziz
parents: 106
diff changeset
427 Type baseType;
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration.
aziz
parents: 106
diff changeset
428 string[] members;
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration.
aziz
parents: 106
diff changeset
429 Expression[] values;
126
0f0e7352e91d - Renamed member hasDefinition of class Declaration to hasBody.
aziz
parents: 125
diff changeset
430 bool hasBody;
107
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration.
aziz
parents: 106
diff changeset
431
115
cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier().
aziz
parents: 114
diff changeset
432 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
433 enumName = requireIdentifier();
107
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration.
aziz
parents: 106
diff changeset
434
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration.
aziz
parents: 106
diff changeset
435 if (token.type == T.Colon)
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration.
aziz
parents: 106
diff changeset
436 {
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration.
aziz
parents: 106
diff changeset
437 nT();
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration.
aziz
parents: 106
diff changeset
438 baseType = parseBasicType();
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration.
aziz
parents: 106
diff changeset
439 }
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration.
aziz
parents: 106
diff changeset
440
115
cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier().
aziz
parents: 114
diff changeset
441 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
442 {
cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier().
aziz
parents: 114
diff changeset
443 //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
444 // 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
445 nT();
cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier().
aziz
parents: 114
diff changeset
446 }
cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier().
aziz
parents: 114
diff changeset
447 else if (token.type == T.LBrace)
107
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration.
aziz
parents: 106
diff changeset
448 {
126
0f0e7352e91d - Renamed member hasDefinition of class Declaration to hasBody.
aziz
parents: 125
diff changeset
449 hasBody = true;
107
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration.
aziz
parents: 106
diff changeset
450 nT();
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration.
aziz
parents: 106
diff changeset
451 do
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration.
aziz
parents: 106
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 members ~= requireIdentifier();
107
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration.
aziz
parents: 106
diff changeset
454
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration.
aziz
parents: 106
diff changeset
455 if (token.type == T.Assign)
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration.
aziz
parents: 106
diff changeset
456 {
115
cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier().
aziz
parents: 114
diff changeset
457 nT();
107
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration.
aziz
parents: 106
diff changeset
458 values ~= parseAssignExpression();
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration.
aziz
parents: 106
diff changeset
459 }
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration.
aziz
parents: 106
diff changeset
460 else
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration.
aziz
parents: 106
diff changeset
461 values ~= null;
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration.
aziz
parents: 106
diff changeset
462
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration.
aziz
parents: 106
diff changeset
463 if (token.type == T.Comma)
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration.
aziz
parents: 106
diff changeset
464 nT();
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration.
aziz
parents: 106
diff changeset
465 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
466 {
124
d4c4cea6ee7f - Renamed method errorIfNot() to expected().
aziz
parents: 123
diff changeset
467 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
468 break;
cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier().
aziz
parents: 114
diff changeset
469 }
107
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration.
aziz
parents: 106
diff changeset
470 } while (token.type != T.RBrace)
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration.
aziz
parents: 106
diff changeset
471 nT();
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration.
aziz
parents: 106
diff changeset
472 }
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration.
aziz
parents: 106
diff changeset
473
126
0f0e7352e91d - Renamed member hasDefinition of class Declaration to hasBody.
aziz
parents: 125
diff changeset
474 return new EnumDeclaration(enumName, baseType, members, values, hasBody);
107
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration.
aziz
parents: 106
diff changeset
475 }
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration.
aziz
parents: 106
diff changeset
476
109
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses().
aziz
parents: 108
diff changeset
477 Declaration parseClassDeclaration()
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses().
aziz
parents: 108
diff changeset
478 {
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses().
aziz
parents: 108
diff changeset
479 assert(token.type == T.Class);
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses().
aziz
parents: 108
diff changeset
480
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses().
aziz
parents: 108
diff changeset
481 string className;
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses().
aziz
parents: 108
diff changeset
482 BaseClass[] bases;
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses().
aziz
parents: 108
diff changeset
483 Declaration[] decls;
126
0f0e7352e91d - Renamed member hasDefinition of class Declaration to hasBody.
aziz
parents: 125
diff changeset
484 bool hasBody;
109
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses().
aziz
parents: 108
diff changeset
485
115
cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier().
aziz
parents: 114
diff changeset
486 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
487 className = requireIdentifier();
109
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses().
aziz
parents: 108
diff changeset
488
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses().
aziz
parents: 108
diff changeset
489 if (token.type == T.LParen)
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses().
aziz
parents: 108
diff changeset
490 {
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses().
aziz
parents: 108
diff changeset
491 // TODO: parse template parameters
140
64d7186b087c - Implemented parseTemplateParameters().
aziz
parents: 139
diff changeset
492 // parseTemplateParameters();
109
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses().
aziz
parents: 108
diff changeset
493 }
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses().
aziz
parents: 108
diff changeset
494
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses().
aziz
parents: 108
diff changeset
495 if (token.type == T.Colon)
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses().
aziz
parents: 108
diff changeset
496 bases = parseBaseClasses();
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses().
aziz
parents: 108
diff changeset
497
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses().
aziz
parents: 108
diff changeset
498 if (token.type == T.Semicolon)
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses().
aziz
parents: 108
diff changeset
499 {
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses().
aziz
parents: 108
diff changeset
500 //if (bases.length != 0)
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses().
aziz
parents: 108
diff changeset
501 // error: bases classes are not allowed in forward declarations.
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses().
aziz
parents: 108
diff changeset
502 nT();
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses().
aziz
parents: 108
diff changeset
503 }
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses().
aziz
parents: 108
diff changeset
504 else if (token.type == T.LBrace)
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses().
aziz
parents: 108
diff changeset
505 {
126
0f0e7352e91d - Renamed member hasDefinition of class Declaration to hasBody.
aziz
parents: 125
diff changeset
506 hasBody = true;
109
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses().
aziz
parents: 108
diff changeset
507 nT();
115
cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier().
aziz
parents: 114
diff changeset
508 // 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
509 decls = parseDeclarationDefinitions();
109
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses().
aziz
parents: 108
diff changeset
510 require(T.RBrace);
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses().
aziz
parents: 108
diff changeset
511 }
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses().
aziz
parents: 108
diff changeset
512 else
124
d4c4cea6ee7f - Renamed method errorIfNot() to expected().
aziz
parents: 123
diff changeset
513 expected(T.LBrace); // TODO: better error msg
109
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses().
aziz
parents: 108
diff changeset
514
113
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations.
aziz
parents: 112
diff changeset
515 // TODO: error if decls.length == 0
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations.
aziz
parents: 112
diff changeset
516
126
0f0e7352e91d - Renamed member hasDefinition of class Declaration to hasBody.
aziz
parents: 125
diff changeset
517 return new ClassDeclaration(className, bases, decls, hasBody);
109
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses().
aziz
parents: 108
diff changeset
518 }
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses().
aziz
parents: 108
diff changeset
519
144
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon.
aziz
parents: 143
diff changeset
520 BaseClass[] parseBaseClasses(bool colonLeadsOff = true)
109
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses().
aziz
parents: 108
diff changeset
521 {
144
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon.
aziz
parents: 143
diff changeset
522 if (colonLeadsOff)
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon.
aziz
parents: 143
diff changeset
523 {
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon.
aziz
parents: 143
diff changeset
524 assert(token.type == T.Colon);
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon.
aziz
parents: 143
diff changeset
525 nT(); // Skip colon
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon.
aziz
parents: 143
diff changeset
526 }
109
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses().
aziz
parents: 108
diff changeset
527
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses().
aziz
parents: 108
diff changeset
528 BaseClass[] bases;
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses().
aziz
parents: 108
diff changeset
529
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses().
aziz
parents: 108
diff changeset
530 while (1)
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses().
aziz
parents: 108
diff changeset
531 {
117
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters.
aziz
parents: 116
diff changeset
532 Protection prot = Protection.Public;
109
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses().
aziz
parents: 108
diff changeset
533 switch (token.type)
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses().
aziz
parents: 108
diff changeset
534 {
158
759f437313f9 - Moved enum Protection and class BaseClass to module Types.
aziz
parents: 157
diff changeset
535 // TODO: What about class Foo : typeof(new Bar)?
759f437313f9 - Moved enum Protection and class BaseClass to module Types.
aziz
parents: 157
diff changeset
536 case T.Identifier, T.Dot/+, Typeof+/: goto LparseBasicType;
109
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses().
aziz
parents: 108
diff changeset
537 case T.Private: prot = Protection.Private; break;
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses().
aziz
parents: 108
diff changeset
538 case T.Protected: prot = Protection.Protected; break;
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses().
aziz
parents: 108
diff changeset
539 case T.Package: prot = Protection.Package; break;
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses().
aziz
parents: 108
diff changeset
540 case T.Public: /*prot = Protection.Public;*/ break;
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses().
aziz
parents: 108
diff changeset
541 default:
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses().
aziz
parents: 108
diff changeset
542 // TODO: issue error msg
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses().
aziz
parents: 108
diff changeset
543 return bases;
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses().
aziz
parents: 108
diff changeset
544 }
158
759f437313f9 - Moved enum Protection and class BaseClass to module Types.
aziz
parents: 157
diff changeset
545 nT(); // Skip protection attribute.
759f437313f9 - Moved enum Protection and class BaseClass to module Types.
aziz
parents: 157
diff changeset
546 LparseBasicType:
759f437313f9 - Moved enum Protection and class BaseClass to module Types.
aziz
parents: 157
diff changeset
547 auto type = parseBasicType();
759f437313f9 - Moved enum Protection and class BaseClass to module Types.
aziz
parents: 157
diff changeset
548 //if (type.tid != TID.DotList)
759f437313f9 - Moved enum Protection and class BaseClass to module Types.
aziz
parents: 157
diff changeset
549 // TODO: issue error msg. base classes can only be one or more identifiers or template instances separated by dots.
759f437313f9 - Moved enum Protection and class BaseClass to module Types.
aziz
parents: 157
diff changeset
550 bases ~= new BaseClass(prot, type);
109
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses().
aziz
parents: 108
diff changeset
551 if (token.type != T.Comma)
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses().
aziz
parents: 108
diff changeset
552 break;
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses().
aziz
parents: 108
diff changeset
553 }
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses().
aziz
parents: 108
diff changeset
554 return bases;
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses().
aziz
parents: 108
diff changeset
555 }
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses().
aziz
parents: 108
diff changeset
556
112
004d98df65af - Implemented parseInterfaceDeclaration().
aziz
parents: 111
diff changeset
557 Declaration parseInterfaceDeclaration()
004d98df65af - Implemented parseInterfaceDeclaration().
aziz
parents: 111
diff changeset
558 {
004d98df65af - Implemented parseInterfaceDeclaration().
aziz
parents: 111
diff changeset
559 assert(token.type == T.Interface);
004d98df65af - Implemented parseInterfaceDeclaration().
aziz
parents: 111
diff changeset
560
004d98df65af - Implemented parseInterfaceDeclaration().
aziz
parents: 111
diff changeset
561 string name;
004d98df65af - Implemented parseInterfaceDeclaration().
aziz
parents: 111
diff changeset
562 BaseClass[] bases;
004d98df65af - Implemented parseInterfaceDeclaration().
aziz
parents: 111
diff changeset
563 Declaration[] decls;
126
0f0e7352e91d - Renamed member hasDefinition of class Declaration to hasBody.
aziz
parents: 125
diff changeset
564 bool hasBody;
112
004d98df65af - Implemented parseInterfaceDeclaration().
aziz
parents: 111
diff changeset
565
115
cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier().
aziz
parents: 114
diff changeset
566 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
567 name = requireIdentifier();
112
004d98df65af - Implemented parseInterfaceDeclaration().
aziz
parents: 111
diff changeset
568
004d98df65af - Implemented parseInterfaceDeclaration().
aziz
parents: 111
diff changeset
569 if (token.type == T.LParen)
004d98df65af - Implemented parseInterfaceDeclaration().
aziz
parents: 111
diff changeset
570 {
004d98df65af - Implemented parseInterfaceDeclaration().
aziz
parents: 111
diff changeset
571 // TODO: parse template parameters
004d98df65af - Implemented parseInterfaceDeclaration().
aziz
parents: 111
diff changeset
572 }
004d98df65af - Implemented parseInterfaceDeclaration().
aziz
parents: 111
diff changeset
573
004d98df65af - Implemented parseInterfaceDeclaration().
aziz
parents: 111
diff changeset
574 if (token.type == T.Colon)
004d98df65af - Implemented parseInterfaceDeclaration().
aziz
parents: 111
diff changeset
575 bases = parseBaseClasses();
004d98df65af - Implemented parseInterfaceDeclaration().
aziz
parents: 111
diff changeset
576
004d98df65af - Implemented parseInterfaceDeclaration().
aziz
parents: 111
diff changeset
577 if (token.type == T.Semicolon)
004d98df65af - Implemented parseInterfaceDeclaration().
aziz
parents: 111
diff changeset
578 {
004d98df65af - Implemented parseInterfaceDeclaration().
aziz
parents: 111
diff changeset
579 //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
580 // TODO: error: base classes are not allowed in forward declarations.
112
004d98df65af - Implemented parseInterfaceDeclaration().
aziz
parents: 111
diff changeset
581 nT();
004d98df65af - Implemented parseInterfaceDeclaration().
aziz
parents: 111
diff changeset
582 }
004d98df65af - Implemented parseInterfaceDeclaration().
aziz
parents: 111
diff changeset
583 else if (token.type == T.LBrace)
004d98df65af - Implemented parseInterfaceDeclaration().
aziz
parents: 111
diff changeset
584 {
126
0f0e7352e91d - Renamed member hasDefinition of class Declaration to hasBody.
aziz
parents: 125
diff changeset
585 hasBody = true;
112
004d98df65af - Implemented parseInterfaceDeclaration().
aziz
parents: 111
diff changeset
586 nT();
004d98df65af - Implemented parseInterfaceDeclaration().
aziz
parents: 111
diff changeset
587 decls = parseDeclarationDefinitions();
004d98df65af - Implemented parseInterfaceDeclaration().
aziz
parents: 111
diff changeset
588 require(T.RBrace);
004d98df65af - Implemented parseInterfaceDeclaration().
aziz
parents: 111
diff changeset
589 }
004d98df65af - Implemented parseInterfaceDeclaration().
aziz
parents: 111
diff changeset
590 else
124
d4c4cea6ee7f - Renamed method errorIfNot() to expected().
aziz
parents: 123
diff changeset
591 expected(T.LBrace); // TODO: better error msg
112
004d98df65af - Implemented parseInterfaceDeclaration().
aziz
parents: 111
diff changeset
592
113
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations.
aziz
parents: 112
diff changeset
593 // TODO: error if decls.length == 0
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations.
aziz
parents: 112
diff changeset
594
126
0f0e7352e91d - Renamed member hasDefinition of class Declaration to hasBody.
aziz
parents: 125
diff changeset
595 return new InterfaceDeclaration(name, bases, decls, hasBody);
112
004d98df65af - Implemented parseInterfaceDeclaration().
aziz
parents: 111
diff changeset
596 }
004d98df65af - Implemented parseInterfaceDeclaration().
aziz
parents: 111
diff changeset
597
113
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations.
aziz
parents: 112
diff changeset
598 Declaration parseAggregateDeclaration()
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations.
aziz
parents: 112
diff changeset
599 {
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations.
aziz
parents: 112
diff changeset
600 assert(token.type == T.Struct || token.type == T.Union);
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations.
aziz
parents: 112
diff changeset
601
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations.
aziz
parents: 112
diff changeset
602 TOK tok = token.type;
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations.
aziz
parents: 112
diff changeset
603
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations.
aziz
parents: 112
diff changeset
604 string name;
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations.
aziz
parents: 112
diff changeset
605 Declaration[] decls;
126
0f0e7352e91d - Renamed member hasDefinition of class Declaration to hasBody.
aziz
parents: 125
diff changeset
606 bool hasBody;
113
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations.
aziz
parents: 112
diff changeset
607
115
cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier().
aziz
parents: 114
diff changeset
608 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
609 // name is optional.
113
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations.
aziz
parents: 112
diff changeset
610 if (token.type == T.Identifier)
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations.
aziz
parents: 112
diff changeset
611 {
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations.
aziz
parents: 112
diff changeset
612 name = token.identifier;
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations.
aziz
parents: 112
diff changeset
613 nT();
115
cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier().
aziz
parents: 114
diff changeset
614 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
615 {
cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier().
aziz
parents: 114
diff changeset
616 // 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
617 }
113
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations.
aziz
parents: 112
diff changeset
618 }
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations.
aziz
parents: 112
diff changeset
619
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations.
aziz
parents: 112
diff changeset
620 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
621 {
cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier().
aziz
parents: 114
diff changeset
622 //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
623 // TODO: error: forward declarations must have a name.
113
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations.
aziz
parents: 112
diff changeset
624 nT();
115
cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier().
aziz
parents: 114
diff changeset
625 }
113
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations.
aziz
parents: 112
diff changeset
626 else if (token.type == T.LBrace)
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations.
aziz
parents: 112
diff changeset
627 {
126
0f0e7352e91d - Renamed member hasDefinition of class Declaration to hasBody.
aziz
parents: 125
diff changeset
628 hasBody = true;
113
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations.
aziz
parents: 112
diff changeset
629 nT();
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations.
aziz
parents: 112
diff changeset
630 decls = parseDeclarationDefinitions();
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations.
aziz
parents: 112
diff changeset
631 require(T.RBrace);
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations.
aziz
parents: 112
diff changeset
632 }
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations.
aziz
parents: 112
diff changeset
633 else
124
d4c4cea6ee7f - Renamed method errorIfNot() to expected().
aziz
parents: 123
diff changeset
634 expected(T.LBrace); // TODO: better error msg
113
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations.
aziz
parents: 112
diff changeset
635
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations.
aziz
parents: 112
diff changeset
636 // TODO: error if decls.length == 0
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations.
aziz
parents: 112
diff changeset
637
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations.
aziz
parents: 112
diff changeset
638 if (tok == T.Struct)
126
0f0e7352e91d - Renamed member hasDefinition of class Declaration to hasBody.
aziz
parents: 125
diff changeset
639 return new StructDeclaration(name, decls, hasBody);
113
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations.
aziz
parents: 112
diff changeset
640 else
126
0f0e7352e91d - Renamed member hasDefinition of class Declaration to hasBody.
aziz
parents: 125
diff changeset
641 return new UnionDeclaration(name, decls, hasBody);
113
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations.
aziz
parents: 112
diff changeset
642 }
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations.
aziz
parents: 112
diff changeset
643
117
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters.
aziz
parents: 116
diff changeset
644 Declaration parseConstructorDeclaration()
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters.
aziz
parents: 116
diff changeset
645 {
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters.
aziz
parents: 116
diff changeset
646 assert(token.type == T.This);
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters.
aziz
parents: 116
diff changeset
647 nT(); // Skip 'this' keyword.
143
e760d7552f66 - Renamed parseArgumentList() to parseArguments().
aziz
parents: 141
diff changeset
648 auto parameters = parseParameterList();
117
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters.
aziz
parents: 116
diff changeset
649 require(T.LBrace);
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters.
aziz
parents: 116
diff changeset
650 auto statements = parseStatements();
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters.
aziz
parents: 116
diff changeset
651 require(T.RBrace);
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters.
aziz
parents: 116
diff changeset
652 return new ConstructorDeclaration(parameters, statements);
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters.
aziz
parents: 116
diff changeset
653 }
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters.
aziz
parents: 116
diff changeset
654
118
379f33cbd521 - Added parseDestructorDeclaration() and DestructorDeclaration class.
aziz
parents: 117
diff changeset
655 Declaration parseDestructorDeclaration()
379f33cbd521 - Added parseDestructorDeclaration() and DestructorDeclaration class.
aziz
parents: 117
diff changeset
656 {
379f33cbd521 - Added parseDestructorDeclaration() and DestructorDeclaration class.
aziz
parents: 117
diff changeset
657 assert(token.type == T.Tilde);
379f33cbd521 - Added parseDestructorDeclaration() and DestructorDeclaration class.
aziz
parents: 117
diff changeset
658 nT(); // Skip ~
379f33cbd521 - Added parseDestructorDeclaration() and DestructorDeclaration class.
aziz
parents: 117
diff changeset
659 require(T.This);
379f33cbd521 - Added parseDestructorDeclaration() and DestructorDeclaration class.
aziz
parents: 117
diff changeset
660 require(T.LParen);
379f33cbd521 - Added parseDestructorDeclaration() and DestructorDeclaration class.
aziz
parents: 117
diff changeset
661 require(T.RParen);
379f33cbd521 - Added parseDestructorDeclaration() and DestructorDeclaration class.
aziz
parents: 117
diff changeset
662 require(T.LBrace);
379f33cbd521 - Added parseDestructorDeclaration() and DestructorDeclaration class.
aziz
parents: 117
diff changeset
663 auto statements = parseStatements();
379f33cbd521 - Added parseDestructorDeclaration() and DestructorDeclaration class.
aziz
parents: 117
diff changeset
664 require(T.RBrace);
379f33cbd521 - Added parseDestructorDeclaration() and DestructorDeclaration class.
aziz
parents: 117
diff changeset
665 return new DestructorDeclaration(statements);
379f33cbd521 - Added parseDestructorDeclaration() and DestructorDeclaration class.
aziz
parents: 117
diff changeset
666 }
379f33cbd521 - Added parseDestructorDeclaration() and DestructorDeclaration class.
aziz
parents: 117
diff changeset
667
119
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration().
aziz
parents: 118
diff changeset
668 Declaration parseStaticConstructorDeclaration()
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration().
aziz
parents: 118
diff changeset
669 {
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration().
aziz
parents: 118
diff changeset
670 assert(token.type == T.Static);
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration().
aziz
parents: 118
diff changeset
671 nT(); // Skip static keyword.
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration().
aziz
parents: 118
diff changeset
672 nT(); // Skip 'this' keyword.
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration().
aziz
parents: 118
diff changeset
673 require(T.LParen);
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration().
aziz
parents: 118
diff changeset
674 require(T.RParen);
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration().
aziz
parents: 118
diff changeset
675 require(T.LBrace);
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration().
aziz
parents: 118
diff changeset
676 auto statements = parseStatements();
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration().
aziz
parents: 118
diff changeset
677 require(T.RBrace);
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration().
aziz
parents: 118
diff changeset
678 return new StaticConstructorDeclaration(statements);
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration().
aziz
parents: 118
diff changeset
679 }
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration().
aziz
parents: 118
diff changeset
680
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration().
aziz
parents: 118
diff changeset
681 Declaration parseStaticDestructorDeclaration()
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration().
aziz
parents: 118
diff changeset
682 {
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration().
aziz
parents: 118
diff changeset
683 assert(token.type == T.Static);
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration().
aziz
parents: 118
diff changeset
684 nT(); // Skip static keyword.
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration().
aziz
parents: 118
diff changeset
685 nT(); // Skip ~
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration().
aziz
parents: 118
diff changeset
686 require(T.This);
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration().
aziz
parents: 118
diff changeset
687 require(T.LParen);
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration().
aziz
parents: 118
diff changeset
688 require(T.RParen);
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration().
aziz
parents: 118
diff changeset
689 require(T.LBrace);
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration().
aziz
parents: 118
diff changeset
690 auto statements = parseStatements();
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration().
aziz
parents: 118
diff changeset
691 require(T.RBrace);
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration().
aziz
parents: 118
diff changeset
692 return new StaticDestructorDeclaration(statements);
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration().
aziz
parents: 118
diff changeset
693 }
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration().
aziz
parents: 118
diff changeset
694
120
e5329dac0405 - Added parseInvariantDeclaration().
aziz
parents: 119
diff changeset
695 Declaration parseInvariantDeclaration()
e5329dac0405 - Added parseInvariantDeclaration().
aziz
parents: 119
diff changeset
696 {
e5329dac0405 - Added parseInvariantDeclaration().
aziz
parents: 119
diff changeset
697 assert(token.type == T.Invariant);
e5329dac0405 - Added parseInvariantDeclaration().
aziz
parents: 119
diff changeset
698 nT(); // Skip invariant keyword.
e5329dac0405 - Added parseInvariantDeclaration().
aziz
parents: 119
diff changeset
699 // Optional () for getting ready porting to D 2.0
e5329dac0405 - Added parseInvariantDeclaration().
aziz
parents: 119
diff changeset
700 if (token.type == T.LParen)
122
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
701 requireNext(T.RParen);
120
e5329dac0405 - Added parseInvariantDeclaration().
aziz
parents: 119
diff changeset
702 require(T.LBrace);
e5329dac0405 - Added parseInvariantDeclaration().
aziz
parents: 119
diff changeset
703 auto statements = parseStatements();
e5329dac0405 - Added parseInvariantDeclaration().
aziz
parents: 119
diff changeset
704 require(T.RBrace);
e5329dac0405 - Added parseInvariantDeclaration().
aziz
parents: 119
diff changeset
705 return new InvariantDeclaration(statements);
e5329dac0405 - Added parseInvariantDeclaration().
aziz
parents: 119
diff changeset
706 }
e5329dac0405 - Added parseInvariantDeclaration().
aziz
parents: 119
diff changeset
707
121
030933c6b5f0 - Added parseUnittestDeclaration().
aziz
parents: 120
diff changeset
708 Declaration parseUnittestDeclaration()
030933c6b5f0 - Added parseUnittestDeclaration().
aziz
parents: 120
diff changeset
709 {
030933c6b5f0 - Added parseUnittestDeclaration().
aziz
parents: 120
diff changeset
710 assert(token.type == T.Unittest);
030933c6b5f0 - Added parseUnittestDeclaration().
aziz
parents: 120
diff changeset
711
122
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
712 nT(); // Skip unittest keyword.
121
030933c6b5f0 - Added parseUnittestDeclaration().
aziz
parents: 120
diff changeset
713 require(T.LBrace);
030933c6b5f0 - Added parseUnittestDeclaration().
aziz
parents: 120
diff changeset
714 auto statements = parseStatements();
030933c6b5f0 - Added parseUnittestDeclaration().
aziz
parents: 120
diff changeset
715 require(T.RBrace);
030933c6b5f0 - Added parseUnittestDeclaration().
aziz
parents: 120
diff changeset
716 return new UnittestDeclaration(statements);
030933c6b5f0 - Added parseUnittestDeclaration().
aziz
parents: 120
diff changeset
717 }
030933c6b5f0 - Added parseUnittestDeclaration().
aziz
parents: 120
diff changeset
718
122
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
719 Declaration parseDebugDeclaration()
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
720 {
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
721 assert(token.type == T.Debug);
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
722
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
723 nT(); // Skip debug keyword.
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
724
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
725 int levelSpec = -1; // debug = Integer ;
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
726 string identSpec; // debug = Identifier ;
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
727 int levelCond = -1; // debug ( Integer )
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
728 string identCond; // debug ( Identifier )
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
729 Declaration[] decls, elseDecls;
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
730
123
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
731 void parseIdentOrInt(ref string ident, ref int level)
122
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
732 {
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
733 nT();
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
734 if (token.type == T.Int32)
123
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
735 level = token.int_;
122
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
736 else if (token.type == T.Identifier)
123
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
737 ident = token.identifier;
122
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
738 else
124
d4c4cea6ee7f - Renamed method errorIfNot() to expected().
aziz
parents: 123
diff changeset
739 expected(T.Identifier); // TODO: better error msg
122
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
740 nT();
123
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
741 }
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
742
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
743 if (token.type == T.Assign)
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
744 {
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
745 parseIdentOrInt(identSpec, levelSpec);
122
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
746 require(T.Semicolon);
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
747 }
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
748 else
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
749 {
123
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
750 // Condition:
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
751 // Integer
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
752 // Identifier
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
753 // ( Condition )
122
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
754 if (token.type == T.LParen)
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
755 {
123
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
756 parseIdentOrInt(identCond, levelCond);
122
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
757 require(T.RParen);
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
758 }
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
759
123
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
760 // debug DeclarationsBlock
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
761 // debug ( Condition ) DeclarationsBlock
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
762 decls = parseDeclarationsBlock();
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
763
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
764 // else DeclarationsBlock
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
765 // debug without condition and else statement makes no sense
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
766 if (token.type == T.Else && (levelCond != -1 || identCond.length != 0))
122
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
767 {
123
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
768 nT();
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
769 //if (token.type == T.Colon)
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
770 // TODO: avoid "else:"?
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
771 elseDecls = parseDeclarationsBlock();
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
772 }
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
773 // else
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
774 // TODO: issue error msg
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
775 }
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
776
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
777 return new DebugDeclaration(levelSpec, identSpec, levelCond, identCond, decls, elseDecls);
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
778 }
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
779
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
780 Declaration parseVersionDeclaration()
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
781 {
146
8180eb84e69c - Started implementation of parseAttributeSpecifier().
aziz
parents: 145
diff changeset
782 assert(token.type == T.Version);
123
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
783
146
8180eb84e69c - Started implementation of parseAttributeSpecifier().
aziz
parents: 145
diff changeset
784 nT(); // Skip version keyword.
123
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
785
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
786 int levelSpec = -1; // version = Integer ;
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
787 string identSpec; // version = Identifier ;
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
788 int levelCond = -1; // version ( Integer )
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
789 string identCond; // version ( Identifier )
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
790 Declaration[] decls, elseDecls;
122
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
791
123
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
792 void parseIdentOrInt(ref string ident, ref int level)
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
793 {
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
794 nT();
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
795 if (token.type == T.Int32)
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
796 level = token.int_;
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
797 else if (token.type == T.Identifier)
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
798 ident = token.identifier;
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
799 else
124
d4c4cea6ee7f - Renamed method errorIfNot() to expected().
aziz
parents: 123
diff changeset
800 expected(T.Identifier); // TODO: better error msg
123
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
801 nT();
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
802 }
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
803
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
804 if (token.type == T.Assign)
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
805 {
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
806 parseIdentOrInt(identSpec, levelSpec);
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
807 require(T.Semicolon);
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
808 }
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
809 else
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
810 {
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
811 // Condition:
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
812 // Integer
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
813 // Identifier
146
8180eb84e69c - Started implementation of parseAttributeSpecifier().
aziz
parents: 145
diff changeset
814
123
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
815 // ( Condition )
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
816 require(T.LParen);
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
817 parseIdentOrInt(identCond, levelCond);
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
818 require(T.RParen);
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
819
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
820 // version ( Condition ) DeclarationsBlock
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
821 decls = parseDeclarationsBlock();
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
822
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
823 // else DeclarationsBlock
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
824 if (token.type == T.Else)
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
825 {
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
826 nT();
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
827 //if (token.type == T.Colon)
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
828 // TODO: avoid "else:"?
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
829 elseDecls = parseDeclarationsBlock();
122
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
830 }
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
831 }
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
832
123
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
833 return new VersionDeclaration(levelSpec, identSpec, levelCond, identCond, decls, elseDecls);
122
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
834 }
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
835
125
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration.
aziz
parents: 124
diff changeset
836 Declaration parseStaticIfDeclaration()
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration.
aziz
parents: 124
diff changeset
837 {
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration.
aziz
parents: 124
diff changeset
838 assert(token.type == T.Static);
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration.
aziz
parents: 124
diff changeset
839
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration.
aziz
parents: 124
diff changeset
840 nT(); // Skip static keyword.
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration.
aziz
parents: 124
diff changeset
841 nT(); // Skip if keyword.
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration.
aziz
parents: 124
diff changeset
842
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration.
aziz
parents: 124
diff changeset
843 Expression condition;
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration.
aziz
parents: 124
diff changeset
844 Declaration[] ifDecls, elseDecls;
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration.
aziz
parents: 124
diff changeset
845
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration.
aziz
parents: 124
diff changeset
846 require(T.LParen);
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration.
aziz
parents: 124
diff changeset
847 condition = parseAssignExpression();
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration.
aziz
parents: 124
diff changeset
848 require(T.RParen);
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration.
aziz
parents: 124
diff changeset
849
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration.
aziz
parents: 124
diff changeset
850 if (token.type != T.Colon)
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration.
aziz
parents: 124
diff changeset
851 ifDecls = parseDeclarationsBlock();
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration.
aziz
parents: 124
diff changeset
852 else
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration.
aziz
parents: 124
diff changeset
853 expected(T.LBrace); // TODO: better error msg
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration.
aziz
parents: 124
diff changeset
854
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration.
aziz
parents: 124
diff changeset
855 if (token.type == T.Else)
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration.
aziz
parents: 124
diff changeset
856 {
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration.
aziz
parents: 124
diff changeset
857 nT();
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration.
aziz
parents: 124
diff changeset
858 if (token.type != T.Colon)
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration.
aziz
parents: 124
diff changeset
859 elseDecls = parseDeclarationsBlock();
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration.
aziz
parents: 124
diff changeset
860 else
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration.
aziz
parents: 124
diff changeset
861 expected(T.LBrace); // TODO: better error msg
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration.
aziz
parents: 124
diff changeset
862 }
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration.
aziz
parents: 124
diff changeset
863
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration.
aziz
parents: 124
diff changeset
864 return new StaticIfDeclaration(condition, ifDecls, elseDecls);
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration.
aziz
parents: 124
diff changeset
865 }
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration.
aziz
parents: 124
diff changeset
866
127
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration.
aziz
parents: 126
diff changeset
867 Declaration parseStaticAssertDeclaration()
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration.
aziz
parents: 126
diff changeset
868 {
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration.
aziz
parents: 126
diff changeset
869 assert(token.type == T.Static);
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration.
aziz
parents: 126
diff changeset
870
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration.
aziz
parents: 126
diff changeset
871 nT(); // Skip static keyword.
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration.
aziz
parents: 126
diff changeset
872 nT(); // Skip assert keyword.
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration.
aziz
parents: 126
diff changeset
873
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration.
aziz
parents: 126
diff changeset
874 Expression condition, message;
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration.
aziz
parents: 126
diff changeset
875
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration.
aziz
parents: 126
diff changeset
876 require(T.LParen);
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration.
aziz
parents: 126
diff changeset
877
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration.
aziz
parents: 126
diff changeset
878 condition = parseAssignExpression();
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration.
aziz
parents: 126
diff changeset
879
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration.
aziz
parents: 126
diff changeset
880 if (token.type == T.Comma)
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration.
aziz
parents: 126
diff changeset
881 {
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration.
aziz
parents: 126
diff changeset
882 nT();
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration.
aziz
parents: 126
diff changeset
883 message = parseAssignExpression();
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration.
aziz
parents: 126
diff changeset
884 }
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration.
aziz
parents: 126
diff changeset
885
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration.
aziz
parents: 126
diff changeset
886 require(T.RParen);
128
e02b87281b4e - Static asserts have to end with a semicolon.
aziz
parents: 127
diff changeset
887 require(T.Semicolon);
127
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration.
aziz
parents: 126
diff changeset
888
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration.
aziz
parents: 126
diff changeset
889 return new StaticAssertDeclaration(condition, message);
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration.
aziz
parents: 126
diff changeset
890 }
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration.
aziz
parents: 126
diff changeset
891
140
64d7186b087c - Implemented parseTemplateParameters().
aziz
parents: 139
diff changeset
892 Declaration parseTemplateDeclaration()
64d7186b087c - Implemented parseTemplateParameters().
aziz
parents: 139
diff changeset
893 {
64d7186b087c - Implemented parseTemplateParameters().
aziz
parents: 139
diff changeset
894 assert(token.type == T.Template);
64d7186b087c - Implemented parseTemplateParameters().
aziz
parents: 139
diff changeset
895 nT(); // Skip template keyword.
64d7186b087c - Implemented parseTemplateParameters().
aziz
parents: 139
diff changeset
896 auto templateName = requireIdentifier();
143
e760d7552f66 - Renamed parseArgumentList() to parseArguments().
aziz
parents: 141
diff changeset
897 auto templateParams = parseTemplateParameterList();
140
64d7186b087c - Implemented parseTemplateParameters().
aziz
parents: 139
diff changeset
898 require(T.LBrace);
64d7186b087c - Implemented parseTemplateParameters().
aziz
parents: 139
diff changeset
899 auto decls = parseDeclarationDefinitions();
64d7186b087c - Implemented parseTemplateParameters().
aziz
parents: 139
diff changeset
900 require(T.RBrace);
64d7186b087c - Implemented parseTemplateParameters().
aziz
parents: 139
diff changeset
901 return new TemplateDeclaration(templateName, templateParams, decls);
64d7186b087c - Implemented parseTemplateParameters().
aziz
parents: 139
diff changeset
902 }
64d7186b087c - Implemented parseTemplateParameters().
aziz
parents: 139
diff changeset
903
141
7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration().
aziz
parents: 140
diff changeset
904 Declaration parseNewDeclaration()
7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration().
aziz
parents: 140
diff changeset
905 {
7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration().
aziz
parents: 140
diff changeset
906 assert(token.type == T.New);
7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration().
aziz
parents: 140
diff changeset
907 nT(); // Skip new keyword.
143
e760d7552f66 - Renamed parseArgumentList() to parseArguments().
aziz
parents: 141
diff changeset
908 auto parameters = parseParameterList();
141
7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration().
aziz
parents: 140
diff changeset
909 require(T.LBrace);
7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration().
aziz
parents: 140
diff changeset
910 auto decls = parseDeclarationDefinitions();
7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration().
aziz
parents: 140
diff changeset
911 require(T.RBrace);
7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration().
aziz
parents: 140
diff changeset
912 return new NewDeclaration(parameters, decls);
7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration().
aziz
parents: 140
diff changeset
913 }
7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration().
aziz
parents: 140
diff changeset
914
7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration().
aziz
parents: 140
diff changeset
915 Declaration parseDeleteDeclaration()
7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration().
aziz
parents: 140
diff changeset
916 {
7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration().
aziz
parents: 140
diff changeset
917 assert(token.type == T.Delete);
7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration().
aziz
parents: 140
diff changeset
918 nT(); // Skip delete keyword.
143
e760d7552f66 - Renamed parseArgumentList() to parseArguments().
aziz
parents: 141
diff changeset
919 auto parameters = parseParameterList();
141
7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration().
aziz
parents: 140
diff changeset
920 // TODO: only one parameter of type void* allowed.
7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration().
aziz
parents: 140
diff changeset
921 require(T.LBrace);
7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration().
aziz
parents: 140
diff changeset
922 auto decls = parseDeclarationDefinitions();
7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration().
aziz
parents: 140
diff changeset
923 require(T.RBrace);
7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration().
aziz
parents: 140
diff changeset
924 return new DeleteDeclaration(parameters, decls);
7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration().
aziz
parents: 140
diff changeset
925 }
7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration().
aziz
parents: 140
diff changeset
926
154
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
927 /+
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
928 DotListExpression:
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
929 . DotListItems
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
930 DotListItems
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
931 Typeof
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
932 Typeof . DotListItems
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
933 DotListItems:
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
934 DotListItem
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
935 DotListItem . DotListItems
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
936 DotListItem:
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
937 Identifier
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
938 TemplateInstance
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
939 NewExpression
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
940 TemplateInstance:
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
941 Identifier !( TemplateArgumentList )
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
942 +/
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
943 DotListExpression parseDotListExpression()
152
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression.
aziz
parents: 151
diff changeset
944 {
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression.
aziz
parents: 151
diff changeset
945 Expression[] identList;
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression.
aziz
parents: 151
diff changeset
946 if (token.type == T.Dot)
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression.
aziz
parents: 151
diff changeset
947 {
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression.
aziz
parents: 151
diff changeset
948 nT();
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression.
aziz
parents: 151
diff changeset
949 identList ~= new IdentifierExpression(".");
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression.
aziz
parents: 151
diff changeset
950 }
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression.
aziz
parents: 151
diff changeset
951 else if (token.type == T.Typeof)
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression.
aziz
parents: 151
diff changeset
952 {
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression.
aziz
parents: 151
diff changeset
953 requireNext(T.LParen);
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression.
aziz
parents: 151
diff changeset
954 auto type = new TypeofType(parseExpression());
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression.
aziz
parents: 151
diff changeset
955 require(T.RParen);
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression.
aziz
parents: 151
diff changeset
956 identList ~= new TypeofExpression(type);
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression.
aziz
parents: 151
diff changeset
957 if (token.type != T.Dot)
154
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
958 goto Lreturn;
152
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression.
aziz
parents: 151
diff changeset
959 nT();
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression.
aziz
parents: 151
diff changeset
960 }
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression.
aziz
parents: 151
diff changeset
961
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression.
aziz
parents: 151
diff changeset
962 while (1)
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression.
aziz
parents: 151
diff changeset
963 {
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression.
aziz
parents: 151
diff changeset
964 string ident = requireIdentifier();
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression.
aziz
parents: 151
diff changeset
965 Token next;
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression.
aziz
parents: 151
diff changeset
966 lx.peek(next);
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression.
aziz
parents: 151
diff changeset
967 if (token.type == T.Not && next.type == T.LParen) // Identifier !( TemplateArguments )
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression.
aziz
parents: 151
diff changeset
968 {
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression.
aziz
parents: 151
diff changeset
969 nT(); // Skip !.
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression.
aziz
parents: 151
diff changeset
970 identList ~= new TemplateInstanceExpression(ident, parseTemplateArguments());
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression.
aziz
parents: 151
diff changeset
971 }
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression.
aziz
parents: 151
diff changeset
972 else // Identifier
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression.
aziz
parents: 151
diff changeset
973 identList ~= new IdentifierExpression(ident);
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression.
aziz
parents: 151
diff changeset
974
154
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
975 LnewExpressionLoop:
152
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression.
aziz
parents: 151
diff changeset
976 if (token.type != T.Dot)
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression.
aziz
parents: 151
diff changeset
977 break;
154
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
978 nT(); // Skip dot.
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
979
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
980 if (token.type == T.New)
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
981 {
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
982 identList ~= parseNewExpression();
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
983 goto LnewExpressionLoop;
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
984 }
152
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression.
aziz
parents: 151
diff changeset
985 }
154
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
986 Lreturn:
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
987 return new DotListExpression(identList);
152
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression.
aziz
parents: 151
diff changeset
988 }
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression.
aziz
parents: 151
diff changeset
989
154
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
990 /+
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
991 DotListType:
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
992 . TypeItems
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
993 TypeItems
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
994 Typeof
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
995 Typeof . TypeItems
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
996 TypeItems:
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
997 TypeItem
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
998 TypeItem . TypeItems
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
999 TypeItem:
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
1000 Identifier
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
1001 TemplateInstance
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
1002 TemplateInstance:
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
1003 Identifier !( TemplateArgumentList )
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
1004 +/
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
1005 DotListType parseDotListType()
153
66790fc2c0a2 - Added method parseIdentifierListType().
aziz
parents: 152
diff changeset
1006 {
66790fc2c0a2 - Added method parseIdentifierListType().
aziz
parents: 152
diff changeset
1007 Type[] identList;
66790fc2c0a2 - Added method parseIdentifierListType().
aziz
parents: 152
diff changeset
1008 if (token.type == T.Dot)
66790fc2c0a2 - Added method parseIdentifierListType().
aziz
parents: 152
diff changeset
1009 {
66790fc2c0a2 - Added method parseIdentifierListType().
aziz
parents: 152
diff changeset
1010 nT();
66790fc2c0a2 - Added method parseIdentifierListType().
aziz
parents: 152
diff changeset
1011 identList ~= new IdentifierType(".");
66790fc2c0a2 - Added method parseIdentifierListType().
aziz
parents: 152
diff changeset
1012 }
66790fc2c0a2 - Added method parseIdentifierListType().
aziz
parents: 152
diff changeset
1013 else if (token.type == T.Typeof)
66790fc2c0a2 - Added method parseIdentifierListType().
aziz
parents: 152
diff changeset
1014 {
66790fc2c0a2 - Added method parseIdentifierListType().
aziz
parents: 152
diff changeset
1015 requireNext(T.LParen);
66790fc2c0a2 - Added method parseIdentifierListType().
aziz
parents: 152
diff changeset
1016 identList ~= new TypeofType(parseExpression());
66790fc2c0a2 - Added method parseIdentifierListType().
aziz
parents: 152
diff changeset
1017 require(T.RParen);
66790fc2c0a2 - Added method parseIdentifierListType().
aziz
parents: 152
diff changeset
1018 if (token.type != T.Dot)
154
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
1019 goto Lreturn;
153
66790fc2c0a2 - Added method parseIdentifierListType().
aziz
parents: 152
diff changeset
1020 nT();
66790fc2c0a2 - Added method parseIdentifierListType().
aziz
parents: 152
diff changeset
1021 }
66790fc2c0a2 - Added method parseIdentifierListType().
aziz
parents: 152
diff changeset
1022
66790fc2c0a2 - Added method parseIdentifierListType().
aziz
parents: 152
diff changeset
1023 while (1)
66790fc2c0a2 - Added method parseIdentifierListType().
aziz
parents: 152
diff changeset
1024 {
66790fc2c0a2 - Added method parseIdentifierListType().
aziz
parents: 152
diff changeset
1025 string ident = requireIdentifier();
154
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
1026 // NB.: Currently Types can't be followed by "!=" so we don't need to peek for "(" when parsing TemplateInstances.
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
1027 /+Token next;
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
1028 lx.peek(next);+/
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
1029 if (token.type == T.Not/+ && next.type == T.LParen+/) // Identifier !( TemplateArguments )
153
66790fc2c0a2 - Added method parseIdentifierListType().
aziz
parents: 152
diff changeset
1030 {
66790fc2c0a2 - Added method parseIdentifierListType().
aziz
parents: 152
diff changeset
1031 nT(); // Skip !.
66790fc2c0a2 - Added method parseIdentifierListType().
aziz
parents: 152
diff changeset
1032 identList ~= new TemplateInstanceType(ident, parseTemplateArguments());
66790fc2c0a2 - Added method parseIdentifierListType().
aziz
parents: 152
diff changeset
1033 }
66790fc2c0a2 - Added method parseIdentifierListType().
aziz
parents: 152
diff changeset
1034 else // Identifier
66790fc2c0a2 - Added method parseIdentifierListType().
aziz
parents: 152
diff changeset
1035 identList ~= new IdentifierType(ident);
66790fc2c0a2 - Added method parseIdentifierListType().
aziz
parents: 152
diff changeset
1036
66790fc2c0a2 - Added method parseIdentifierListType().
aziz
parents: 152
diff changeset
1037 if (token.type != T.Dot)
66790fc2c0a2 - Added method parseIdentifierListType().
aziz
parents: 152
diff changeset
1038 break;
66790fc2c0a2 - Added method parseIdentifierListType().
aziz
parents: 152
diff changeset
1039 nT();
66790fc2c0a2 - Added method parseIdentifierListType().
aziz
parents: 152
diff changeset
1040 }
154
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
1041 Lreturn:
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
1042 return new DotListType(identList);
153
66790fc2c0a2 - Added method parseIdentifierListType().
aziz
parents: 152
diff changeset
1043 }
66790fc2c0a2 - Added method parseIdentifierListType().
aziz
parents: 152
diff changeset
1044
150
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument.
aziz
parents: 149
diff changeset
1045 /*
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument.
aziz
parents: 149
diff changeset
1046 TemplateMixin:
151
2e959f67000b - Added code for parsing mixin expression declarations.
aziz
parents: 150
diff changeset
1047 mixin ( AssignExpression ) ;
150
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument.
aziz
parents: 149
diff changeset
1048 mixin TemplateIdentifier ;
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument.
aziz
parents: 149
diff changeset
1049 mixin TemplateIdentifier MixinIdentifier ;
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument.
aziz
parents: 149
diff changeset
1050 mixin TemplateIdentifier !( TemplateArgumentList ) ;
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument.
aziz
parents: 149
diff changeset
1051 mixin TemplateIdentifier !( TemplateArgumentList ) MixinIdentifier ;
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument.
aziz
parents: 149
diff changeset
1052 */
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument.
aziz
parents: 149
diff changeset
1053 Declaration parseMixinDeclaration()
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument.
aziz
parents: 149
diff changeset
1054 {
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument.
aziz
parents: 149
diff changeset
1055 assert(token.type == T.Mixin);
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument.
aziz
parents: 149
diff changeset
1056 nT(); // Skip mixin keyword.
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument.
aziz
parents: 149
diff changeset
1057
151
2e959f67000b - Added code for parsing mixin expression declarations.
aziz
parents: 150
diff changeset
1058 if (token.type == T.LParen)
2e959f67000b - Added code for parsing mixin expression declarations.
aziz
parents: 150
diff changeset
1059 {
2e959f67000b - Added code for parsing mixin expression declarations.
aziz
parents: 150
diff changeset
1060 // TODO: What about mixin(...).ident;?
2e959f67000b - Added code for parsing mixin expression declarations.
aziz
parents: 150
diff changeset
1061 nT();
2e959f67000b - Added code for parsing mixin expression declarations.
aziz
parents: 150
diff changeset
1062 auto e = parseAssignExpression();
2e959f67000b - Added code for parsing mixin expression declarations.
aziz
parents: 150
diff changeset
1063 require(T.RParen);
2e959f67000b - Added code for parsing mixin expression declarations.
aziz
parents: 150
diff changeset
1064 require(T.Semicolon);
2e959f67000b - Added code for parsing mixin expression declarations.
aziz
parents: 150
diff changeset
1065 return new MixinDeclaration(e);
2e959f67000b - Added code for parsing mixin expression declarations.
aziz
parents: 150
diff changeset
1066 }
2e959f67000b - Added code for parsing mixin expression declarations.
aziz
parents: 150
diff changeset
1067
150
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument.
aziz
parents: 149
diff changeset
1068 Expression[] templateIdent;
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument.
aziz
parents: 149
diff changeset
1069 string mixinIdent;
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument.
aziz
parents: 149
diff changeset
1070
159
5aa877506db0 - Added enum Linkage.
aziz
parents: 158
diff changeset
1071 // This code is similar to parseDotListType().
150
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument.
aziz
parents: 149
diff changeset
1072 if (token.type == T.Dot)
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument.
aziz
parents: 149
diff changeset
1073 {
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument.
aziz
parents: 149
diff changeset
1074 nT();
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument.
aziz
parents: 149
diff changeset
1075 templateIdent ~= new IdentifierExpression(".");
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument.
aziz
parents: 149
diff changeset
1076 }
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument.
aziz
parents: 149
diff changeset
1077
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument.
aziz
parents: 149
diff changeset
1078 while (1)
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument.
aziz
parents: 149
diff changeset
1079 {
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument.
aziz
parents: 149
diff changeset
1080 string ident = requireIdentifier();
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument.
aziz
parents: 149
diff changeset
1081 if (token.type == T.Not) // Identifier !( TemplateArguments )
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument.
aziz
parents: 149
diff changeset
1082 {
151
2e959f67000b - Added code for parsing mixin expression declarations.
aziz
parents: 150
diff changeset
1083 // No need to peek for T.LParen. This must be a template instance.
150
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument.
aziz
parents: 149
diff changeset
1084 nT();
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument.
aziz
parents: 149
diff changeset
1085 templateIdent ~= new TemplateInstanceExpression(ident, parseTemplateArguments());
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument.
aziz
parents: 149
diff changeset
1086 }
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument.
aziz
parents: 149
diff changeset
1087 else // Identifier
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument.
aziz
parents: 149
diff changeset
1088 templateIdent ~= new IdentifierExpression(ident);
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument.
aziz
parents: 149
diff changeset
1089
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument.
aziz
parents: 149
diff changeset
1090 if (token.type != T.Dot)
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument.
aziz
parents: 149
diff changeset
1091 break;
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument.
aziz
parents: 149
diff changeset
1092 nT();
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument.
aziz
parents: 149
diff changeset
1093 }
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument.
aziz
parents: 149
diff changeset
1094
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument.
aziz
parents: 149
diff changeset
1095 if (token.type == T.Identifier)
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument.
aziz
parents: 149
diff changeset
1096 {
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument.
aziz
parents: 149
diff changeset
1097 mixinIdent = token.identifier;
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument.
aziz
parents: 149
diff changeset
1098 nT();
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument.
aziz
parents: 149
diff changeset
1099 }
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument.
aziz
parents: 149
diff changeset
1100
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument.
aziz
parents: 149
diff changeset
1101 require(T.Semicolon);
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument.
aziz
parents: 149
diff changeset
1102
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument.
aziz
parents: 149
diff changeset
1103 return new MixinDeclaration(templateIdent, mixinIdent);
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument.
aziz
parents: 149
diff changeset
1104 }
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument.
aziz
parents: 149
diff changeset
1105
102
6e8b67ae15b7 - Added modules Declarations and Statements.
aziz
parents: 101
diff changeset
1106 /+++++++++++++++++++++++++++++
161
82c5cfc7d6d3 - Started implementation of parsing statements.
aziz
parents: 160
diff changeset
1107 + Statement parsing methods +
82c5cfc7d6d3 - Started implementation of parsing statements.
aziz
parents: 160
diff changeset
1108 +++++++++++++++++++++++++++++/
82c5cfc7d6d3 - Started implementation of parsing statements.
aziz
parents: 160
diff changeset
1109
82c5cfc7d6d3 - Started implementation of parsing statements.
aziz
parents: 160
diff changeset
1110 Statements parseStatements()
82c5cfc7d6d3 - Started implementation of parsing statements.
aziz
parents: 160
diff changeset
1111 {
162
c7b250662c74 - Added class ScopeStatement.
aziz
parents: 161
diff changeset
1112 auto statements = new Statements();
161
82c5cfc7d6d3 - Started implementation of parsing statements.
aziz
parents: 160
diff changeset
1113 while (token.type != T.RBrace && token.type != T.EOF)
82c5cfc7d6d3 - Started implementation of parsing statements.
aziz
parents: 160
diff changeset
1114 statements ~= parseStatement();
82c5cfc7d6d3 - Started implementation of parsing statements.
aziz
parents: 160
diff changeset
1115 return statements;
82c5cfc7d6d3 - Started implementation of parsing statements.
aziz
parents: 160
diff changeset
1116 }
82c5cfc7d6d3 - Started implementation of parsing statements.
aziz
parents: 160
diff changeset
1117
82c5cfc7d6d3 - Started implementation of parsing statements.
aziz
parents: 160
diff changeset
1118 Statement parseStatement()
82c5cfc7d6d3 - Started implementation of parsing statements.
aziz
parents: 160
diff changeset
1119 {
82c5cfc7d6d3 - Started implementation of parsing statements.
aziz
parents: 160
diff changeset
1120 Statement s;
82c5cfc7d6d3 - Started implementation of parsing statements.
aziz
parents: 160
diff changeset
1121 switch (token.type)
82c5cfc7d6d3 - Started implementation of parsing statements.
aziz
parents: 160
diff changeset
1122 {
82c5cfc7d6d3 - Started implementation of parsing statements.
aziz
parents: 160
diff changeset
1123 case T.Identifier:
82c5cfc7d6d3 - Started implementation of parsing statements.
aziz
parents: 160
diff changeset
1124 Token next;
82c5cfc7d6d3 - Started implementation of parsing statements.
aziz
parents: 160
diff changeset
1125 lx.peek(next);
82c5cfc7d6d3 - Started implementation of parsing statements.
aziz
parents: 160
diff changeset
1126 if (next.type == T.Colon)
82c5cfc7d6d3 - Started implementation of parsing statements.
aziz
parents: 160
diff changeset
1127 {
82c5cfc7d6d3 - Started implementation of parsing statements.
aziz
parents: 160
diff changeset
1128 string ident = token.identifier;
82c5cfc7d6d3 - Started implementation of parsing statements.
aziz
parents: 160
diff changeset
1129 nT(); // Skip Identifier
82c5cfc7d6d3 - Started implementation of parsing statements.
aziz
parents: 160
diff changeset
1130 nT(); // Skip :
82c5cfc7d6d3 - Started implementation of parsing statements.
aziz
parents: 160
diff changeset
1131 s = parseStatements();
82c5cfc7d6d3 - Started implementation of parsing statements.
aziz
parents: 160
diff changeset
1132 s = new LabeledStatement(ident, s);
82c5cfc7d6d3 - Started implementation of parsing statements.
aziz
parents: 160
diff changeset
1133 break;
82c5cfc7d6d3 - Started implementation of parsing statements.
aziz
parents: 160
diff changeset
1134 }
82c5cfc7d6d3 - Started implementation of parsing statements.
aziz
parents: 160
diff changeset
1135 goto case_Declaration;
82c5cfc7d6d3 - Started implementation of parsing statements.
aziz
parents: 160
diff changeset
1136 case_Declaration:
82c5cfc7d6d3 - Started implementation of parsing statements.
aziz
parents: 160
diff changeset
1137 // TODO: parse Declaration
82c5cfc7d6d3 - Started implementation of parsing statements.
aziz
parents: 160
diff changeset
1138 break;
162
c7b250662c74 - Added class ScopeStatement.
aziz
parents: 161
diff changeset
1139 case T.If:
c7b250662c74 - Added class ScopeStatement.
aziz
parents: 161
diff changeset
1140 s = parseIfStatement();
c7b250662c74 - Added class ScopeStatement.
aziz
parents: 161
diff changeset
1141 break;
164
8ec99326752b - Implemented parseWhileStatement().
aziz
parents: 163
diff changeset
1142 case T.While:
8ec99326752b - Implemented parseWhileStatement().
aziz
parents: 163
diff changeset
1143 s = parseWhileStatement();
8ec99326752b - Implemented parseWhileStatement().
aziz
parents: 163
diff changeset
1144 break;
165
797074d143d7 - Implemented parseDoWhileStatement().
aziz
parents: 164
diff changeset
1145 case T.Do:
797074d143d7 - Implemented parseDoWhileStatement().
aziz
parents: 164
diff changeset
1146 s = parseDoWhileStatement();
797074d143d7 - Implemented parseDoWhileStatement().
aziz
parents: 164
diff changeset
1147 break;
169
4666a05dfacf - Implemented parseForeachStatement().
aziz
parents: 168
diff changeset
1148 case T.Foreach, T.Foreach_reverse:
4666a05dfacf - Implemented parseForeachStatement().
aziz
parents: 168
diff changeset
1149 s = parseForeachStatement();
4666a05dfacf - Implemented parseForeachStatement().
aziz
parents: 168
diff changeset
1150 break;
161
82c5cfc7d6d3 - Started implementation of parsing statements.
aziz
parents: 160
diff changeset
1151 default:
164
8ec99326752b - Implemented parseWhileStatement().
aziz
parents: 163
diff changeset
1152 // TODO: issue error msg and return IllegalStatement.
161
82c5cfc7d6d3 - Started implementation of parsing statements.
aziz
parents: 160
diff changeset
1153 }
82c5cfc7d6d3 - Started implementation of parsing statements.
aziz
parents: 160
diff changeset
1154 return s;
82c5cfc7d6d3 - Started implementation of parsing statements.
aziz
parents: 160
diff changeset
1155 }
82c5cfc7d6d3 - Started implementation of parsing statements.
aziz
parents: 160
diff changeset
1156
162
c7b250662c74 - Added class ScopeStatement.
aziz
parents: 161
diff changeset
1157 /+
c7b250662c74 - Added class ScopeStatement.
aziz
parents: 161
diff changeset
1158 ScopeStatement:
c7b250662c74 - Added class ScopeStatement.
aziz
parents: 161
diff changeset
1159 NonEmptyStatement
c7b250662c74 - Added class ScopeStatement.
aziz
parents: 161
diff changeset
1160 BlockStatement
c7b250662c74 - Added class ScopeStatement.
aziz
parents: 161
diff changeset
1161 BlockStatement:
c7b250662c74 - Added class ScopeStatement.
aziz
parents: 161
diff changeset
1162 { }
c7b250662c74 - Added class ScopeStatement.
aziz
parents: 161
diff changeset
1163 { StatementList }
c7b250662c74 - Added class ScopeStatement.
aziz
parents: 161
diff changeset
1164 +/
164
8ec99326752b - Implemented parseWhileStatement().
aziz
parents: 163
diff changeset
1165 Statement parseScopeStatement()
162
c7b250662c74 - Added class ScopeStatement.
aziz
parents: 161
diff changeset
1166 {
c7b250662c74 - Added class ScopeStatement.
aziz
parents: 161
diff changeset
1167 Statement s;
c7b250662c74 - Added class ScopeStatement.
aziz
parents: 161
diff changeset
1168 if (token.type == T.LBrace)
c7b250662c74 - Added class ScopeStatement.
aziz
parents: 161
diff changeset
1169 {
c7b250662c74 - Added class ScopeStatement.
aziz
parents: 161
diff changeset
1170 nT();
c7b250662c74 - Added class ScopeStatement.
aziz
parents: 161
diff changeset
1171 auto ss = new Statements();
c7b250662c74 - Added class ScopeStatement.
aziz
parents: 161
diff changeset
1172 while (token.type != T.RBrace && token.type != T.EOF)
c7b250662c74 - Added class ScopeStatement.
aziz
parents: 161
diff changeset
1173 ss ~= parseStatement();
c7b250662c74 - Added class ScopeStatement.
aziz
parents: 161
diff changeset
1174 require(T.RBrace);
c7b250662c74 - Added class ScopeStatement.
aziz
parents: 161
diff changeset
1175 s = ss;
c7b250662c74 - Added class ScopeStatement.
aziz
parents: 161
diff changeset
1176 }
c7b250662c74 - Added class ScopeStatement.
aziz
parents: 161
diff changeset
1177 else
c7b250662c74 - Added class ScopeStatement.
aziz
parents: 161
diff changeset
1178 s = parseStatement();
c7b250662c74 - Added class ScopeStatement.
aziz
parents: 161
diff changeset
1179 return new ScopeStatement(s);
c7b250662c74 - Added class ScopeStatement.
aziz
parents: 161
diff changeset
1180 }
c7b250662c74 - Added class ScopeStatement.
aziz
parents: 161
diff changeset
1181
166
56334292a29e - Implemented parseForStatement().
aziz
parents: 165
diff changeset
1182 /+
56334292a29e - Implemented parseForStatement().
aziz
parents: 165
diff changeset
1183 NoScopeStatement:
56334292a29e - Implemented parseForStatement().
aziz
parents: 165
diff changeset
1184 NonEmptyStatement
56334292a29e - Implemented parseForStatement().
aziz
parents: 165
diff changeset
1185 BlockStatement
56334292a29e - Implemented parseForStatement().
aziz
parents: 165
diff changeset
1186 BlockStatement:
56334292a29e - Implemented parseForStatement().
aziz
parents: 165
diff changeset
1187 { }
56334292a29e - Implemented parseForStatement().
aziz
parents: 165
diff changeset
1188 { StatementList }
56334292a29e - Implemented parseForStatement().
aziz
parents: 165
diff changeset
1189 +/
56334292a29e - Implemented parseForStatement().
aziz
parents: 165
diff changeset
1190 Statement parseNoScopeStatement()
56334292a29e - Implemented parseForStatement().
aziz
parents: 165
diff changeset
1191 {
56334292a29e - Implemented parseForStatement().
aziz
parents: 165
diff changeset
1192 Statement s;
56334292a29e - Implemented parseForStatement().
aziz
parents: 165
diff changeset
1193 if (token.type == T.LBrace)
56334292a29e - Implemented parseForStatement().
aziz
parents: 165
diff changeset
1194 {
56334292a29e - Implemented parseForStatement().
aziz
parents: 165
diff changeset
1195 nT();
56334292a29e - Implemented parseForStatement().
aziz
parents: 165
diff changeset
1196 auto ss = new Statements();
56334292a29e - Implemented parseForStatement().
aziz
parents: 165
diff changeset
1197 while (token.type != T.RBrace && token.type != T.EOF)
56334292a29e - Implemented parseForStatement().
aziz
parents: 165
diff changeset
1198 ss ~= parseStatement();
56334292a29e - Implemented parseForStatement().
aziz
parents: 165
diff changeset
1199 require(T.RBrace);
56334292a29e - Implemented parseForStatement().
aziz
parents: 165
diff changeset
1200 s = ss;
56334292a29e - Implemented parseForStatement().
aziz
parents: 165
diff changeset
1201 }
56334292a29e - Implemented parseForStatement().
aziz
parents: 165
diff changeset
1202 else
56334292a29e - Implemented parseForStatement().
aziz
parents: 165
diff changeset
1203 s = parseStatement();
56334292a29e - Implemented parseForStatement().
aziz
parents: 165
diff changeset
1204 return s;
56334292a29e - Implemented parseForStatement().
aziz
parents: 165
diff changeset
1205 }
56334292a29e - Implemented parseForStatement().
aziz
parents: 165
diff changeset
1206
162
c7b250662c74 - Added class ScopeStatement.
aziz
parents: 161
diff changeset
1207 Statement parseIfStatement()
c7b250662c74 - Added class ScopeStatement.
aziz
parents: 161
diff changeset
1208 {
c7b250662c74 - Added class ScopeStatement.
aziz
parents: 161
diff changeset
1209 assert(token.type == T.If);
c7b250662c74 - Added class ScopeStatement.
aziz
parents: 161
diff changeset
1210 nT();
c7b250662c74 - Added class ScopeStatement.
aziz
parents: 161
diff changeset
1211
c7b250662c74 - Added class ScopeStatement.
aziz
parents: 161
diff changeset
1212 Type type;
c7b250662c74 - Added class ScopeStatement.
aziz
parents: 161
diff changeset
1213 string ident;
c7b250662c74 - Added class ScopeStatement.
aziz
parents: 161
diff changeset
1214 Expression condition;
c7b250662c74 - Added class ScopeStatement.
aziz
parents: 161
diff changeset
1215 Statement ifBody, elseBody;
c7b250662c74 - Added class ScopeStatement.
aziz
parents: 161
diff changeset
1216
c7b250662c74 - Added class ScopeStatement.
aziz
parents: 161
diff changeset
1217 require(T.LParen);
c7b250662c74 - Added class ScopeStatement.
aziz
parents: 161
diff changeset
1218 // auto Identifier = Expression
c7b250662c74 - Added class ScopeStatement.
aziz
parents: 161
diff changeset
1219 if (token.type == T.Auto)
c7b250662c74 - Added class ScopeStatement.
aziz
parents: 161
diff changeset
1220 {
c7b250662c74 - Added class ScopeStatement.
aziz
parents: 161
diff changeset
1221 nT();
c7b250662c74 - Added class ScopeStatement.
aziz
parents: 161
diff changeset
1222 ident = requireIdentifier();
c7b250662c74 - Added class ScopeStatement.
aziz
parents: 161
diff changeset
1223 require(T.Assign);
c7b250662c74 - Added class ScopeStatement.
aziz
parents: 161
diff changeset
1224 }
c7b250662c74 - Added class ScopeStatement.
aziz
parents: 161
diff changeset
1225 else
c7b250662c74 - Added class ScopeStatement.
aziz
parents: 161
diff changeset
1226 {
c7b250662c74 - Added class ScopeStatement.
aziz
parents: 161
diff changeset
1227 // Declarator = Expression
c7b250662c74 - Added class ScopeStatement.
aziz
parents: 161
diff changeset
1228 bool failed;
c7b250662c74 - Added class ScopeStatement.
aziz
parents: 161
diff changeset
1229 type = try_(parseDeclarator(ident), failed);
c7b250662c74 - Added class ScopeStatement.
aziz
parents: 161
diff changeset
1230 if (!failed)
c7b250662c74 - Added class ScopeStatement.
aziz
parents: 161
diff changeset
1231 {
c7b250662c74 - Added class ScopeStatement.
aziz
parents: 161
diff changeset
1232 require(T.Assign);
c7b250662c74 - Added class ScopeStatement.
aziz
parents: 161
diff changeset
1233 }
163
f27a98bb17c7 - Fix: when parsing Declarator fails, type and ident is set to null.
aziz
parents: 162
diff changeset
1234 else
f27a98bb17c7 - Fix: when parsing Declarator fails, type and ident is set to null.
aziz
parents: 162
diff changeset
1235 {
f27a98bb17c7 - Fix: when parsing Declarator fails, type and ident is set to null.
aziz
parents: 162
diff changeset
1236 type = null;
f27a98bb17c7 - Fix: when parsing Declarator fails, type and ident is set to null.
aziz
parents: 162
diff changeset
1237 ident = null;
f27a98bb17c7 - Fix: when parsing Declarator fails, type and ident is set to null.
aziz
parents: 162
diff changeset
1238 }
162
c7b250662c74 - Added class ScopeStatement.
aziz
parents: 161
diff changeset
1239 }
c7b250662c74 - Added class ScopeStatement.
aziz
parents: 161
diff changeset
1240 condition = parseExpression();
c7b250662c74 - Added class ScopeStatement.
aziz
parents: 161
diff changeset
1241 require(T.RParen);
164
8ec99326752b - Implemented parseWhileStatement().
aziz
parents: 163
diff changeset
1242 ifBody = parseScopeStatement();
162
c7b250662c74 - Added class ScopeStatement.
aziz
parents: 161
diff changeset
1243 if (token.type == T.Else)
c7b250662c74 - Added class ScopeStatement.
aziz
parents: 161
diff changeset
1244 {
c7b250662c74 - Added class ScopeStatement.
aziz
parents: 161
diff changeset
1245 nT();
164
8ec99326752b - Implemented parseWhileStatement().
aziz
parents: 163
diff changeset
1246 elseBody = parseScopeStatement();
162
c7b250662c74 - Added class ScopeStatement.
aziz
parents: 161
diff changeset
1247 }
c7b250662c74 - Added class ScopeStatement.
aziz
parents: 161
diff changeset
1248 return new IfStatement(type, ident, condition, ifBody, elseBody);
c7b250662c74 - Added class ScopeStatement.
aziz
parents: 161
diff changeset
1249 }
c7b250662c74 - Added class ScopeStatement.
aziz
parents: 161
diff changeset
1250
164
8ec99326752b - Implemented parseWhileStatement().
aziz
parents: 163
diff changeset
1251 Statement parseWhileStatement()
8ec99326752b - Implemented parseWhileStatement().
aziz
parents: 163
diff changeset
1252 {
8ec99326752b - Implemented parseWhileStatement().
aziz
parents: 163
diff changeset
1253 assert(token.type == T.While);
8ec99326752b - Implemented parseWhileStatement().
aziz
parents: 163
diff changeset
1254 nT();
166
56334292a29e - Implemented parseForStatement().
aziz
parents: 165
diff changeset
1255 require(T.LParen);
164
8ec99326752b - Implemented parseWhileStatement().
aziz
parents: 163
diff changeset
1256 auto condition = parseExpression();
166
56334292a29e - Implemented parseForStatement().
aziz
parents: 165
diff changeset
1257 require(T.RParen);
164
8ec99326752b - Implemented parseWhileStatement().
aziz
parents: 163
diff changeset
1258 return new WhileStatement(condition, parseScopeStatement());
8ec99326752b - Implemented parseWhileStatement().
aziz
parents: 163
diff changeset
1259 }
8ec99326752b - Implemented parseWhileStatement().
aziz
parents: 163
diff changeset
1260
165
797074d143d7 - Implemented parseDoWhileStatement().
aziz
parents: 164
diff changeset
1261 Statement parseDoWhileStatement()
797074d143d7 - Implemented parseDoWhileStatement().
aziz
parents: 164
diff changeset
1262 {
797074d143d7 - Implemented parseDoWhileStatement().
aziz
parents: 164
diff changeset
1263 assert(token.type == T.Do);
797074d143d7 - Implemented parseDoWhileStatement().
aziz
parents: 164
diff changeset
1264 nT();
797074d143d7 - Implemented parseDoWhileStatement().
aziz
parents: 164
diff changeset
1265 auto doBody = parseScopeStatement();
797074d143d7 - Implemented parseDoWhileStatement().
aziz
parents: 164
diff changeset
1266 require(T.While);
166
56334292a29e - Implemented parseForStatement().
aziz
parents: 165
diff changeset
1267 require(T.LParen);
165
797074d143d7 - Implemented parseDoWhileStatement().
aziz
parents: 164
diff changeset
1268 auto condition = parseExpression();
166
56334292a29e - Implemented parseForStatement().
aziz
parents: 165
diff changeset
1269 require(T.RParen);
56334292a29e - Implemented parseForStatement().
aziz
parents: 165
diff changeset
1270 return new DoWhileStatement(condition, doBody);
56334292a29e - Implemented parseForStatement().
aziz
parents: 165
diff changeset
1271 }
56334292a29e - Implemented parseForStatement().
aziz
parents: 165
diff changeset
1272
56334292a29e - Implemented parseForStatement().
aziz
parents: 165
diff changeset
1273 Statement parseForStatement()
56334292a29e - Implemented parseForStatement().
aziz
parents: 165
diff changeset
1274 {
56334292a29e - Implemented parseForStatement().
aziz
parents: 165
diff changeset
1275 assert(token.type == T.For);
56334292a29e - Implemented parseForStatement().
aziz
parents: 165
diff changeset
1276 nT();
165
797074d143d7 - Implemented parseDoWhileStatement().
aziz
parents: 164
diff changeset
1277 require(T.LParen);
166
56334292a29e - Implemented parseForStatement().
aziz
parents: 165
diff changeset
1278
56334292a29e - Implemented parseForStatement().
aziz
parents: 165
diff changeset
1279 Statement init, forBody;
56334292a29e - Implemented parseForStatement().
aziz
parents: 165
diff changeset
1280 Expression condition, increment;
56334292a29e - Implemented parseForStatement().
aziz
parents: 165
diff changeset
1281
56334292a29e - Implemented parseForStatement().
aziz
parents: 165
diff changeset
1282 if (token.type != T.Semicolon)
56334292a29e - Implemented parseForStatement().
aziz
parents: 165
diff changeset
1283 init = parseNoScopeStatement();
168
fbbb2434bf6b - Simplified parseForStatement().
aziz
parents: 167
diff changeset
1284 require(T.Semicolon);
166
56334292a29e - Implemented parseForStatement().
aziz
parents: 165
diff changeset
1285 if (token.type != T.Semicolon)
56334292a29e - Implemented parseForStatement().
aziz
parents: 165
diff changeset
1286 condition = parseExpression();
168
fbbb2434bf6b - Simplified parseForStatement().
aziz
parents: 167
diff changeset
1287 require(T.Semicolon);
166
56334292a29e - Implemented parseForStatement().
aziz
parents: 165
diff changeset
1288 if (token.type != T.RParen)
56334292a29e - Implemented parseForStatement().
aziz
parents: 165
diff changeset
1289 increment = parseExpression();
168
fbbb2434bf6b - Simplified parseForStatement().
aziz
parents: 167
diff changeset
1290 require(T.RParen);
167
141b908e32b6 - Fix: forgot parsing forBody.
aziz
parents: 166
diff changeset
1291 forBody = parseScopeStatement();
166
56334292a29e - Implemented parseForStatement().
aziz
parents: 165
diff changeset
1292 return new ForStatement(init, condition, increment, forBody);
165
797074d143d7 - Implemented parseDoWhileStatement().
aziz
parents: 164
diff changeset
1293 }
797074d143d7 - Implemented parseDoWhileStatement().
aziz
parents: 164
diff changeset
1294
169
4666a05dfacf - Implemented parseForeachStatement().
aziz
parents: 168
diff changeset
1295 Statement parseForeachStatement()
4666a05dfacf - Implemented parseForeachStatement().
aziz
parents: 168
diff changeset
1296 {
4666a05dfacf - Implemented parseForeachStatement().
aziz
parents: 168
diff changeset
1297 assert(token.type == T.Foreach || token.type == T.Foreach_reverse);
4666a05dfacf - Implemented parseForeachStatement().
aziz
parents: 168
diff changeset
1298 TOK tok = token.type;
4666a05dfacf - Implemented parseForeachStatement().
aziz
parents: 168
diff changeset
1299 nT();
4666a05dfacf - Implemented parseForeachStatement().
aziz
parents: 168
diff changeset
1300
4666a05dfacf - Implemented parseForeachStatement().
aziz
parents: 168
diff changeset
1301 Parameters params;
4666a05dfacf - Implemented parseForeachStatement().
aziz
parents: 168
diff changeset
1302 Expression aggregate;
4666a05dfacf - Implemented parseForeachStatement().
aziz
parents: 168
diff changeset
1303
4666a05dfacf - Implemented parseForeachStatement().
aziz
parents: 168
diff changeset
1304 require(T.LParen);
4666a05dfacf - Implemented parseForeachStatement().
aziz
parents: 168
diff changeset
1305 while (1)
4666a05dfacf - Implemented parseForeachStatement().
aziz
parents: 168
diff changeset
1306 {
4666a05dfacf - Implemented parseForeachStatement().
aziz
parents: 168
diff changeset
1307 StorageClass stc;
4666a05dfacf - Implemented parseForeachStatement().
aziz
parents: 168
diff changeset
1308 Type type;
4666a05dfacf - Implemented parseForeachStatement().
aziz
parents: 168
diff changeset
1309 string ident;
4666a05dfacf - Implemented parseForeachStatement().
aziz
parents: 168
diff changeset
1310
4666a05dfacf - Implemented parseForeachStatement().
aziz
parents: 168
diff changeset
1311 switch (token.type)
4666a05dfacf - Implemented parseForeachStatement().
aziz
parents: 168
diff changeset
1312 {
4666a05dfacf - Implemented parseForeachStatement().
aziz
parents: 168
diff changeset
1313 case T.Ref:
4666a05dfacf - Implemented parseForeachStatement().
aziz
parents: 168
diff changeset
1314 nT();
4666a05dfacf - Implemented parseForeachStatement().
aziz
parents: 168
diff changeset
1315 stc = StorageClass.Ref;
4666a05dfacf - Implemented parseForeachStatement().
aziz
parents: 168
diff changeset
1316 break;
4666a05dfacf - Implemented parseForeachStatement().
aziz
parents: 168
diff changeset
1317 case T.Identifier:
4666a05dfacf - Implemented parseForeachStatement().
aziz
parents: 168
diff changeset
1318 Token next;
4666a05dfacf - Implemented parseForeachStatement().
aziz
parents: 168
diff changeset
1319 lx.peek(next);
4666a05dfacf - Implemented parseForeachStatement().
aziz
parents: 168
diff changeset
1320 if (next.type == T.Comma || next.type == T.Semicolon || next.type == T.RParen)
4666a05dfacf - Implemented parseForeachStatement().
aziz
parents: 168
diff changeset
1321 {
4666a05dfacf - Implemented parseForeachStatement().
aziz
parents: 168
diff changeset
1322 ident = token.identifier;
4666a05dfacf - Implemented parseForeachStatement().
aziz
parents: 168
diff changeset
1323 nT();
4666a05dfacf - Implemented parseForeachStatement().
aziz
parents: 168
diff changeset
1324 break;
4666a05dfacf - Implemented parseForeachStatement().
aziz
parents: 168
diff changeset
1325 }
4666a05dfacf - Implemented parseForeachStatement().
aziz
parents: 168
diff changeset
1326 // fall through
4666a05dfacf - Implemented parseForeachStatement().
aziz
parents: 168
diff changeset
1327 default:
4666a05dfacf - Implemented parseForeachStatement().
aziz
parents: 168
diff changeset
1328 type = parseDeclarator(ident);
4666a05dfacf - Implemented parseForeachStatement().
aziz
parents: 168
diff changeset
1329 }
4666a05dfacf - Implemented parseForeachStatement().
aziz
parents: 168
diff changeset
1330
4666a05dfacf - Implemented parseForeachStatement().
aziz
parents: 168
diff changeset
1331 params ~= new Parameter(stc, type, ident, null);
4666a05dfacf - Implemented parseForeachStatement().
aziz
parents: 168
diff changeset
1332
4666a05dfacf - Implemented parseForeachStatement().
aziz
parents: 168
diff changeset
1333 if (token.type != T.Comma)
4666a05dfacf - Implemented parseForeachStatement().
aziz
parents: 168
diff changeset
1334 break;
4666a05dfacf - Implemented parseForeachStatement().
aziz
parents: 168
diff changeset
1335 nT();
4666a05dfacf - Implemented parseForeachStatement().
aziz
parents: 168
diff changeset
1336 }
4666a05dfacf - Implemented parseForeachStatement().
aziz
parents: 168
diff changeset
1337 require(T.Semicolon);
4666a05dfacf - Implemented parseForeachStatement().
aziz
parents: 168
diff changeset
1338 aggregate = parseExpression();
4666a05dfacf - Implemented parseForeachStatement().
aziz
parents: 168
diff changeset
1339 require(T.RParen);
4666a05dfacf - Implemented parseForeachStatement().
aziz
parents: 168
diff changeset
1340 auto forBody = parseScopeStatement();
4666a05dfacf - Implemented parseForeachStatement().
aziz
parents: 168
diff changeset
1341 return new ForeachStatement(tok, params, aggregate, forBody);
4666a05dfacf - Implemented parseForeachStatement().
aziz
parents: 168
diff changeset
1342 }
4666a05dfacf - Implemented parseForeachStatement().
aziz
parents: 168
diff changeset
1343
161
82c5cfc7d6d3 - Started implementation of parsing statements.
aziz
parents: 160
diff changeset
1344 /+++++++++++++++++++++++++++++
102
6e8b67ae15b7 - Added modules Declarations and Statements.
aziz
parents: 101
diff changeset
1345 + Expression parsing methods +
6e8b67ae15b7 - Added modules Declarations and Statements.
aziz
parents: 101
diff changeset
1346 +++++++++++++++++++++++++++++/
6e8b67ae15b7 - Added modules Declarations and Statements.
aziz
parents: 101
diff changeset
1347
72
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
1348 Expression parseExpression()
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
1349 {
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
1350 auto e = parseAssignExpression();
122
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
1351 while (token.type == T.Comma)
81
aa1ea2548dd9 - Fixed parseExpression() method.
aziz
parents: 80
diff changeset
1352 e = new CommaExpression(e, parseAssignExpression());
72
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
1353 return e;
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
1354 }
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
1355
71
b3777cca323c - Added Identity and NotIdentity tokens.
aziz
parents: 70
diff changeset
1356 Expression parseAssignExpression()
b3777cca323c - Added Identity and NotIdentity tokens.
aziz
parents: 70
diff changeset
1357 {
b3777cca323c - Added Identity and NotIdentity tokens.
aziz
parents: 70
diff changeset
1358 auto e = parseCondExpression();
72
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
1359 while (1)
71
b3777cca323c - Added Identity and NotIdentity tokens.
aziz
parents: 70
diff changeset
1360 {
87
c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token.
aziz
parents: 86
diff changeset
1361 switch (token.type)
72
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
1362 {
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
1363 case T.Assign:
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
1364 nT(); e = new AssignExpression(e, parseAssignExpression());
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
1365 break;
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
1366 case T.LShiftAssign:
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
1367 nT(); e = new LShiftAssignExpression(e, parseAssignExpression());
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
1368 break;
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
1369 case T.RShiftAssign:
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
1370 nT(); e = new RShiftAssignExpression(e, parseAssignExpression());
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
1371 break;
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
1372 case T.URShiftAssign:
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
1373 nT(); e = new URShiftAssignExpression(e, parseAssignExpression());
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
1374 break;
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
1375 case T.OrAssign:
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
1376 nT(); e = new OrAssignExpression(e, parseAssignExpression());
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
1377 break;
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
1378 case T.AndAssign:
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
1379 nT(); e = new AndAssignExpression(e, parseAssignExpression());
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
1380 break;
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
1381 case T.PlusAssign:
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
1382 nT(); e = new PlusAssignExpression(e, parseAssignExpression());
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
1383 break;
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
1384 case T.MinusAssign:
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
1385 nT(); e = new MinusAssignExpression(e, parseAssignExpression());
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
1386 break;
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
1387 case T.DivAssign:
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
1388 nT(); e = new DivAssignExpression(e, parseAssignExpression());
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
1389 break;
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
1390 case T.MulAssign:
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
1391 nT(); e = new MulAssignExpression(e, parseAssignExpression());
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
1392 break;
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
1393 case T.ModAssign:
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
1394 nT(); e = new ModAssignExpression(e, parseAssignExpression());
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
1395 break;
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
1396 case T.XorAssign:
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
1397 nT(); e = new XorAssignExpression(e, parseAssignExpression());
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
1398 break;
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
1399 case T.CatAssign:
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
1400 nT(); e = new CatAssignExpression(e, parseAssignExpression());
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
1401 break;
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
1402 default:
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
1403 break;
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
1404 }
71
b3777cca323c - Added Identity and NotIdentity tokens.
aziz
parents: 70
diff changeset
1405 break;
b3777cca323c - Added Identity and NotIdentity tokens.
aziz
parents: 70
diff changeset
1406 }
b3777cca323c - Added Identity and NotIdentity tokens.
aziz
parents: 70
diff changeset
1407 return e;
b3777cca323c - Added Identity and NotIdentity tokens.
aziz
parents: 70
diff changeset
1408 }
72
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
1409
71
b3777cca323c - Added Identity and NotIdentity tokens.
aziz
parents: 70
diff changeset
1410 Expression parseCondExpression()
b3777cca323c - Added Identity and NotIdentity tokens.
aziz
parents: 70
diff changeset
1411 {
72
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
1412 auto e = parseOrOrExpression();
87
c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token.
aziz
parents: 86
diff changeset
1413 if (token.type == T.Question)
72
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
1414 {
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
1415 nT();
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
1416 auto iftrue = parseExpression();
87
c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token.
aziz
parents: 86
diff changeset
1417 require(T.Colon);
72
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
1418 auto iffalse = parseCondExpression();
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
1419 e = new CondExpression(e, iftrue, iffalse);
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
1420 }
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
1421 return e;
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
1422 }
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
1423
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
1424 Expression parseOrOrExpression()
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
1425 {
73
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions.
aziz
parents: 72
diff changeset
1426 alias parseAndAndExpression parseNext;
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions.
aziz
parents: 72
diff changeset
1427 auto e = parseNext();
87
c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token.
aziz
parents: 86
diff changeset
1428 if (token.type == T.OrLogical)
73
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions.
aziz
parents: 72
diff changeset
1429 {
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions.
aziz
parents: 72
diff changeset
1430 nT();
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions.
aziz
parents: 72
diff changeset
1431 e = new OrOrExpression(e, parseNext());
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions.
aziz
parents: 72
diff changeset
1432 }
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions.
aziz
parents: 72
diff changeset
1433 return e;
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions.
aziz
parents: 72
diff changeset
1434 }
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions.
aziz
parents: 72
diff changeset
1435
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions.
aziz
parents: 72
diff changeset
1436 Expression parseAndAndExpression()
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions.
aziz
parents: 72
diff changeset
1437 {
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions.
aziz
parents: 72
diff changeset
1438 alias parseOrExpression parseNext;
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions.
aziz
parents: 72
diff changeset
1439 auto e = parseNext();
87
c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token.
aziz
parents: 86
diff changeset
1440 if (token.type == T.AndLogical)
73
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions.
aziz
parents: 72
diff changeset
1441 {
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions.
aziz
parents: 72
diff changeset
1442 nT();
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions.
aziz
parents: 72
diff changeset
1443 e = new AndAndExpression(e, parseNext());
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions.
aziz
parents: 72
diff changeset
1444 }
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions.
aziz
parents: 72
diff changeset
1445 return e;
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions.
aziz
parents: 72
diff changeset
1446 }
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions.
aziz
parents: 72
diff changeset
1447
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions.
aziz
parents: 72
diff changeset
1448 Expression parseOrExpression()
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions.
aziz
parents: 72
diff changeset
1449 {
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions.
aziz
parents: 72
diff changeset
1450 alias parseXorExpression parseNext;
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions.
aziz
parents: 72
diff changeset
1451 auto e = parseNext();
87
c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token.
aziz
parents: 86
diff changeset
1452 if (token.type == T.OrBinary)
73
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions.
aziz
parents: 72
diff changeset
1453 {
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions.
aziz
parents: 72
diff changeset
1454 nT();
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions.
aziz
parents: 72
diff changeset
1455 e = new OrExpression(e, parseNext());
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions.
aziz
parents: 72
diff changeset
1456 }
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions.
aziz
parents: 72
diff changeset
1457 return e;
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions.
aziz
parents: 72
diff changeset
1458 }
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions.
aziz
parents: 72
diff changeset
1459
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions.
aziz
parents: 72
diff changeset
1460 Expression parseXorExpression()
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions.
aziz
parents: 72
diff changeset
1461 {
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions.
aziz
parents: 72
diff changeset
1462 alias parseAndExpression parseNext;
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions.
aziz
parents: 72
diff changeset
1463 auto e = parseNext();
87
c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token.
aziz
parents: 86
diff changeset
1464 if (token.type == T.Xor)
73
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions.
aziz
parents: 72
diff changeset
1465 {
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions.
aziz
parents: 72
diff changeset
1466 nT();
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions.
aziz
parents: 72
diff changeset
1467 e = new XorExpression(e, parseNext());
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions.
aziz
parents: 72
diff changeset
1468 }
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions.
aziz
parents: 72
diff changeset
1469 return e;
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions.
aziz
parents: 72
diff changeset
1470 }
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions.
aziz
parents: 72
diff changeset
1471
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions.
aziz
parents: 72
diff changeset
1472 Expression parseAndExpression()
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions.
aziz
parents: 72
diff changeset
1473 {
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions.
aziz
parents: 72
diff changeset
1474 alias parseCmpExpression parseNext;
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions.
aziz
parents: 72
diff changeset
1475 auto e = parseNext();
87
c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token.
aziz
parents: 86
diff changeset
1476 if (token.type == T.AndBinary)
73
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions.
aziz
parents: 72
diff changeset
1477 {
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions.
aziz
parents: 72
diff changeset
1478 nT();
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions.
aziz
parents: 72
diff changeset
1479 e = new AndExpression(e, parseNext());
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions.
aziz
parents: 72
diff changeset
1480 }
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions.
aziz
parents: 72
diff changeset
1481 return e;
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions.
aziz
parents: 72
diff changeset
1482 }
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions.
aziz
parents: 72
diff changeset
1483
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions.
aziz
parents: 72
diff changeset
1484 Expression parseCmpExpression()
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions.
aziz
parents: 72
diff changeset
1485 {
87
c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token.
aziz
parents: 86
diff changeset
1486 TOK operator = token.type;
74
30b0fb85dda9 - Implemented parseCmpExpression().
aziz
parents: 73
diff changeset
1487
30b0fb85dda9 - Implemented parseCmpExpression().
aziz
parents: 73
diff changeset
1488 auto e = parseShiftExpression();
30b0fb85dda9 - Implemented parseCmpExpression().
aziz
parents: 73
diff changeset
1489
30b0fb85dda9 - Implemented parseCmpExpression().
aziz
parents: 73
diff changeset
1490 switch (operator)
30b0fb85dda9 - Implemented parseCmpExpression().
aziz
parents: 73
diff changeset
1491 {
30b0fb85dda9 - Implemented parseCmpExpression().
aziz
parents: 73
diff changeset
1492 case T.Equal, T.NotEqual:
30b0fb85dda9 - Implemented parseCmpExpression().
aziz
parents: 73
diff changeset
1493 nT();
30b0fb85dda9 - Implemented parseCmpExpression().
aziz
parents: 73
diff changeset
1494 e = new EqualExpression(e, parseShiftExpression(), operator);
30b0fb85dda9 - Implemented parseCmpExpression().
aziz
parents: 73
diff changeset
1495 break;
30b0fb85dda9 - Implemented parseCmpExpression().
aziz
parents: 73
diff changeset
1496 case T.Not:
30b0fb85dda9 - Implemented parseCmpExpression().
aziz
parents: 73
diff changeset
1497 Token t;
30b0fb85dda9 - Implemented parseCmpExpression().
aziz
parents: 73
diff changeset
1498 lx.peek(t);
30b0fb85dda9 - Implemented parseCmpExpression().
aziz
parents: 73
diff changeset
1499 if (t.type != T.Is)
30b0fb85dda9 - Implemented parseCmpExpression().
aziz
parents: 73
diff changeset
1500 break;
30b0fb85dda9 - Implemented parseCmpExpression().
aziz
parents: 73
diff changeset
1501 nT();
30b0fb85dda9 - Implemented parseCmpExpression().
aziz
parents: 73
diff changeset
1502 operator = T.NotIdentity;
30b0fb85dda9 - Implemented parseCmpExpression().
aziz
parents: 73
diff changeset
1503 goto LNotIdentity;
30b0fb85dda9 - Implemented parseCmpExpression().
aziz
parents: 73
diff changeset
1504 case T.Identity:
30b0fb85dda9 - Implemented parseCmpExpression().
aziz
parents: 73
diff changeset
1505 operator = T.Identity;
30b0fb85dda9 - Implemented parseCmpExpression().
aziz
parents: 73
diff changeset
1506 LNotIdentity:
30b0fb85dda9 - Implemented parseCmpExpression().
aziz
parents: 73
diff changeset
1507 nT();
83
9e6d66f647c9 - Fix: IsExpression was created instead of IdentityExpression.
aziz
parents: 81
diff changeset
1508 e = new IdentityExpression(e, parseShiftExpression(), operator);
74
30b0fb85dda9 - Implemented parseCmpExpression().
aziz
parents: 73
diff changeset
1509 break;
30b0fb85dda9 - Implemented parseCmpExpression().
aziz
parents: 73
diff changeset
1510 case T.LessEqual, T.Less, T.GreaterEqual, T.Greater,
30b0fb85dda9 - Implemented parseCmpExpression().
aziz
parents: 73
diff changeset
1511 T.Unordered, T.UorE, T.UorG, T.UorGorE,
30b0fb85dda9 - Implemented parseCmpExpression().
aziz
parents: 73
diff changeset
1512 T.UorL, T.UorLorE, T.LorEorG, T.LorG:
30b0fb85dda9 - Implemented parseCmpExpression().
aziz
parents: 73
diff changeset
1513 nT();
30b0fb85dda9 - Implemented parseCmpExpression().
aziz
parents: 73
diff changeset
1514 e = new RelExpression(e, parseShiftExpression(), operator);
30b0fb85dda9 - Implemented parseCmpExpression().
aziz
parents: 73
diff changeset
1515 break;
30b0fb85dda9 - Implemented parseCmpExpression().
aziz
parents: 73
diff changeset
1516 case T.In:
30b0fb85dda9 - Implemented parseCmpExpression().
aziz
parents: 73
diff changeset
1517 nT();
30b0fb85dda9 - Implemented parseCmpExpression().
aziz
parents: 73
diff changeset
1518 e = new InExpression(e, parseShiftExpression(), operator);
30b0fb85dda9 - Implemented parseCmpExpression().
aziz
parents: 73
diff changeset
1519 break;
30b0fb85dda9 - Implemented parseCmpExpression().
aziz
parents: 73
diff changeset
1520 default:
30b0fb85dda9 - Implemented parseCmpExpression().
aziz
parents: 73
diff changeset
1521 }
30b0fb85dda9 - Implemented parseCmpExpression().
aziz
parents: 73
diff changeset
1522 return e;
30b0fb85dda9 - Implemented parseCmpExpression().
aziz
parents: 73
diff changeset
1523 }
30b0fb85dda9 - Implemented parseCmpExpression().
aziz
parents: 73
diff changeset
1524
30b0fb85dda9 - Implemented parseCmpExpression().
aziz
parents: 73
diff changeset
1525 Expression parseShiftExpression()
30b0fb85dda9 - Implemented parseCmpExpression().
aziz
parents: 73
diff changeset
1526 {
75
3f976d9e0833 - Implemented parseShiftExpression().
aziz
parents: 74
diff changeset
1527 auto e = parseAddExpression();
3f976d9e0833 - Implemented parseShiftExpression().
aziz
parents: 74
diff changeset
1528 while (1)
3f976d9e0833 - Implemented parseShiftExpression().
aziz
parents: 74
diff changeset
1529 {
87
c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token.
aziz
parents: 86
diff changeset
1530 switch (token.type)
75
3f976d9e0833 - Implemented parseShiftExpression().
aziz
parents: 74
diff changeset
1531 {
3f976d9e0833 - Implemented parseShiftExpression().
aziz
parents: 74
diff changeset
1532 case T.LShift: nT(); e = new LShiftExpression(e, parseAddExpression()); break;
3f976d9e0833 - Implemented parseShiftExpression().
aziz
parents: 74
diff changeset
1533 case T.RShift: nT(); e = new RShiftExpression(e, parseAddExpression()); break;
3f976d9e0833 - Implemented parseShiftExpression().
aziz
parents: 74
diff changeset
1534 case T.URShift: nT(); e = new URShiftExpression(e, parseAddExpression()); break;
3f976d9e0833 - Implemented parseShiftExpression().
aziz
parents: 74
diff changeset
1535 default: break;
3f976d9e0833 - Implemented parseShiftExpression().
aziz
parents: 74
diff changeset
1536 }
3f976d9e0833 - Implemented parseShiftExpression().
aziz
parents: 74
diff changeset
1537 break;
3f976d9e0833 - Implemented parseShiftExpression().
aziz
parents: 74
diff changeset
1538 }
3f976d9e0833 - Implemented parseShiftExpression().
aziz
parents: 74
diff changeset
1539 return e;
3f976d9e0833 - Implemented parseShiftExpression().
aziz
parents: 74
diff changeset
1540 }
3f976d9e0833 - Implemented parseShiftExpression().
aziz
parents: 74
diff changeset
1541
3f976d9e0833 - Implemented parseShiftExpression().
aziz
parents: 74
diff changeset
1542 Expression parseAddExpression()
3f976d9e0833 - Implemented parseShiftExpression().
aziz
parents: 74
diff changeset
1543 {
76
a85f9edf6ce7 - Implemented parseAddExpression().
aziz
parents: 75
diff changeset
1544 auto e = parseMulExpression();
a85f9edf6ce7 - Implemented parseAddExpression().
aziz
parents: 75
diff changeset
1545 while (1)
a85f9edf6ce7 - Implemented parseAddExpression().
aziz
parents: 75
diff changeset
1546 {
87
c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token.
aziz
parents: 86
diff changeset
1547 switch (token.type)
76
a85f9edf6ce7 - Implemented parseAddExpression().
aziz
parents: 75
diff changeset
1548 {
a85f9edf6ce7 - Implemented parseAddExpression().
aziz
parents: 75
diff changeset
1549 case T.Plus: nT(); e = new PlusExpression(e, parseMulExpression()); break;
a85f9edf6ce7 - Implemented parseAddExpression().
aziz
parents: 75
diff changeset
1550 case T.Minus: nT(); e = new MinusExpression(e, parseMulExpression()); break;
a85f9edf6ce7 - Implemented parseAddExpression().
aziz
parents: 75
diff changeset
1551 case T.Tilde: nT(); e = new CatExpression(e, parseMulExpression()); break;
a85f9edf6ce7 - Implemented parseAddExpression().
aziz
parents: 75
diff changeset
1552 default: break;
a85f9edf6ce7 - Implemented parseAddExpression().
aziz
parents: 75
diff changeset
1553 }
a85f9edf6ce7 - Implemented parseAddExpression().
aziz
parents: 75
diff changeset
1554 break;
a85f9edf6ce7 - Implemented parseAddExpression().
aziz
parents: 75
diff changeset
1555 }
a85f9edf6ce7 - Implemented parseAddExpression().
aziz
parents: 75
diff changeset
1556 return new Expression();
a85f9edf6ce7 - Implemented parseAddExpression().
aziz
parents: 75
diff changeset
1557 }
a85f9edf6ce7 - Implemented parseAddExpression().
aziz
parents: 75
diff changeset
1558
a85f9edf6ce7 - Implemented parseAddExpression().
aziz
parents: 75
diff changeset
1559 Expression parseMulExpression()
a85f9edf6ce7 - Implemented parseAddExpression().
aziz
parents: 75
diff changeset
1560 {
77
7e21c4df1c02 - Implemented parseMulExpression().
aziz
parents: 76
diff changeset
1561 auto e = parseUnaryExpression();
7e21c4df1c02 - Implemented parseMulExpression().
aziz
parents: 76
diff changeset
1562 while (1)
7e21c4df1c02 - Implemented parseMulExpression().
aziz
parents: 76
diff changeset
1563 {
87
c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token.
aziz
parents: 86
diff changeset
1564 switch (token.type)
77
7e21c4df1c02 - Implemented parseMulExpression().
aziz
parents: 76
diff changeset
1565 {
7e21c4df1c02 - Implemented parseMulExpression().
aziz
parents: 76
diff changeset
1566 case T.Mul: nT(); e = new MulExpression(e, parseUnaryExpression()); break;
7e21c4df1c02 - Implemented parseMulExpression().
aziz
parents: 76
diff changeset
1567 case T.Div: nT(); e = new DivExpression(e, parseUnaryExpression()); break;
7e21c4df1c02 - Implemented parseMulExpression().
aziz
parents: 76
diff changeset
1568 case T.Mod: nT(); e = new ModExpression(e, parseUnaryExpression()); break;
7e21c4df1c02 - Implemented parseMulExpression().
aziz
parents: 76
diff changeset
1569 default: break;
7e21c4df1c02 - Implemented parseMulExpression().
aziz
parents: 76
diff changeset
1570 }
7e21c4df1c02 - Implemented parseMulExpression().
aziz
parents: 76
diff changeset
1571 break;
7e21c4df1c02 - Implemented parseMulExpression().
aziz
parents: 76
diff changeset
1572 }
74
30b0fb85dda9 - Implemented parseCmpExpression().
aziz
parents: 73
diff changeset
1573 return new Expression();
71
b3777cca323c - Added Identity and NotIdentity tokens.
aziz
parents: 70
diff changeset
1574 }
b3777cca323c - Added Identity and NotIdentity tokens.
aziz
parents: 70
diff changeset
1575
91
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list.
aziz
parents: 90
diff changeset
1576 Expression parseUnaryExpression()
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list.
aziz
parents: 90
diff changeset
1577 {
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list.
aziz
parents: 90
diff changeset
1578 Expression e;
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list.
aziz
parents: 90
diff changeset
1579 switch (token.type)
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list.
aziz
parents: 90
diff changeset
1580 {
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list.
aziz
parents: 90
diff changeset
1581 case T.AndBinary:
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list.
aziz
parents: 90
diff changeset
1582 nT(); e = new AddressExpression(parseUnaryExpression());
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list.
aziz
parents: 90
diff changeset
1583 break;
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list.
aziz
parents: 90
diff changeset
1584 case T.PlusPlus:
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list.
aziz
parents: 90
diff changeset
1585 nT(); e = new PreIncrExpression(parseUnaryExpression());
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list.
aziz
parents: 90
diff changeset
1586 break;
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list.
aziz
parents: 90
diff changeset
1587 case T.MinusMinus:
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list.
aziz
parents: 90
diff changeset
1588 nT(); e = new PreDecrExpression(parseUnaryExpression());
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list.
aziz
parents: 90
diff changeset
1589 break;
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list.
aziz
parents: 90
diff changeset
1590 case T.Mul:
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list.
aziz
parents: 90
diff changeset
1591 nT(); e = new DerefExpression(parseUnaryExpression());
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list.
aziz
parents: 90
diff changeset
1592 break;
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list.
aziz
parents: 90
diff changeset
1593 case T.Minus:
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list.
aziz
parents: 90
diff changeset
1594 case T.Plus:
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list.
aziz
parents: 90
diff changeset
1595 nT(); e = new SignExpression(parseUnaryExpression(), token.type);
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list.
aziz
parents: 90
diff changeset
1596 break;
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list.
aziz
parents: 90
diff changeset
1597 case T.Not:
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list.
aziz
parents: 90
diff changeset
1598 nT(); e = new NotExpression(parseUnaryExpression());
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list.
aziz
parents: 90
diff changeset
1599 break;
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list.
aziz
parents: 90
diff changeset
1600 case T.Tilde:
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list.
aziz
parents: 90
diff changeset
1601 nT(); e = new CompExpression(parseUnaryExpression());
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list.
aziz
parents: 90
diff changeset
1602 break;
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list.
aziz
parents: 90
diff changeset
1603 case T.New:
154
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
1604 e = parseNewExpression();
91
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list.
aziz
parents: 90
diff changeset
1605 break;
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list.
aziz
parents: 90
diff changeset
1606 case T.Delete:
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list.
aziz
parents: 90
diff changeset
1607 nT();
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list.
aziz
parents: 90
diff changeset
1608 e = new DeleteExpression(parseUnaryExpression());
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list.
aziz
parents: 90
diff changeset
1609 break;
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list.
aziz
parents: 90
diff changeset
1610 case T.Cast:
99
6b8c248f5911 - Added member type to classes CastExpression and TypeidExpression.
aziz
parents: 98
diff changeset
1611 requireNext(T.LParen);
6b8c248f5911 - Added member type to classes CastExpression and TypeidExpression.
aziz
parents: 98
diff changeset
1612 auto type = parseType();
6b8c248f5911 - Added member type to classes CastExpression and TypeidExpression.
aziz
parents: 98
diff changeset
1613 require(T.RParen);
6b8c248f5911 - Added member type to classes CastExpression and TypeidExpression.
aziz
parents: 98
diff changeset
1614 e = new CastExpression(parseUnaryExpression(), type);
91
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list.
aziz
parents: 90
diff changeset
1615 break;
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list.
aziz
parents: 90
diff changeset
1616 case T.LParen:
102
6e8b67ae15b7 - Added modules Declarations and Statements.
aziz
parents: 101
diff changeset
1617 // ( Type ) . Identifier
99
6b8c248f5911 - Added member type to classes CastExpression and TypeidExpression.
aziz
parents: 98
diff changeset
1618 auto type = parseType();
6b8c248f5911 - Added member type to classes CastExpression and TypeidExpression.
aziz
parents: 98
diff changeset
1619 require(T.RParen);
6b8c248f5911 - Added member type to classes CastExpression and TypeidExpression.
aziz
parents: 98
diff changeset
1620 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
1621 string ident = requireIdentifier();
99
6b8c248f5911 - Added member type to classes CastExpression and TypeidExpression.
aziz
parents: 98
diff changeset
1622 e = new TypeDotIdExpression(type, ident);
91
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list.
aziz
parents: 90
diff changeset
1623 break;
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list.
aziz
parents: 90
diff changeset
1624 default:
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list.
aziz
parents: 90
diff changeset
1625 e = parsePostExpression(parsePrimaryExpression());
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list.
aziz
parents: 90
diff changeset
1626 break;
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list.
aziz
parents: 90
diff changeset
1627 }
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list.
aziz
parents: 90
diff changeset
1628 assert(e !is null);
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list.
aziz
parents: 90
diff changeset
1629 return e;
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list.
aziz
parents: 90
diff changeset
1630 }
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list.
aziz
parents: 90
diff changeset
1631
90
a02950cb7036 - Fixed order of parsing unary, post and primary expressions.
aziz
parents: 89
diff changeset
1632 Expression parsePostExpression(Expression e)
77
7e21c4df1c02 - Implemented parseMulExpression().
aziz
parents: 76
diff changeset
1633 {
79
df4e5c7ad58a - Implemented most of parsePostExpression() and parsePreExpression().
aziz
parents: 78
diff changeset
1634 while (1)
df4e5c7ad58a - Implemented most of parsePostExpression() and parsePreExpression().
aziz
parents: 78
diff changeset
1635 {
87
c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token.
aziz
parents: 86
diff changeset
1636 switch (token.type)
79
df4e5c7ad58a - Implemented most of parsePostExpression() and parsePreExpression().
aziz
parents: 78
diff changeset
1637 {
154
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
1638 /*
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
1639 // Commented out because parseDotListExpression() handles this.
79
df4e5c7ad58a - Implemented most of parsePostExpression() and parsePreExpression().
aziz
parents: 78
diff changeset
1640 case T.Dot:
df4e5c7ad58a - Implemented most of parsePostExpression() and parsePreExpression().
aziz
parents: 78
diff changeset
1641 nT();
87
c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token.
aziz
parents: 86
diff changeset
1642 if (token.type == T.Identifier)
92
6de2e6e7d872 - Fixed parsePostExpression().
aziz
parents: 91
diff changeset
1643 {
153
66790fc2c0a2 - Added method parseIdentifierListType().
aziz
parents: 152
diff changeset
1644 string ident = token.identifier;
66790fc2c0a2 - Added method parseIdentifierListType().
aziz
parents: 152
diff changeset
1645 nT();
66790fc2c0a2 - Added method parseIdentifierListType().
aziz
parents: 152
diff changeset
1646 Token next;
66790fc2c0a2 - Added method parseIdentifierListType().
aziz
parents: 152
diff changeset
1647 lx.peek(next);
66790fc2c0a2 - Added method parseIdentifierListType().
aziz
parents: 152
diff changeset
1648 if (token.type == T.Not && next.type == T.LParen) // Identifier !( TemplateArguments )
66790fc2c0a2 - Added method parseIdentifierListType().
aziz
parents: 152
diff changeset
1649 {
66790fc2c0a2 - Added method parseIdentifierListType().
aziz
parents: 152
diff changeset
1650 nT(); // Skip !.
66790fc2c0a2 - Added method parseIdentifierListType().
aziz
parents: 152
diff changeset
1651 e = new DotTemplateInstanceExpression(e, ident, parseTemplateArguments());
66790fc2c0a2 - Added method parseIdentifierListType().
aziz
parents: 152
diff changeset
1652 }
66790fc2c0a2 - Added method parseIdentifierListType().
aziz
parents: 152
diff changeset
1653 else
66790fc2c0a2 - Added method parseIdentifierListType().
aziz
parents: 152
diff changeset
1654 {
66790fc2c0a2 - Added method parseIdentifierListType().
aziz
parents: 152
diff changeset
1655 e = new DotIdExpression(e, ident);
66790fc2c0a2 - Added method parseIdentifierListType().
aziz
parents: 152
diff changeset
1656 nT();
66790fc2c0a2 - Added method parseIdentifierListType().
aziz
parents: 152
diff changeset
1657 }
92
6de2e6e7d872 - Fixed parsePostExpression().
aziz
parents: 91
diff changeset
1658 }
87
c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token.
aziz
parents: 86
diff changeset
1659 else if (token.type == T.New)
81
aa1ea2548dd9 - Fixed parseExpression() method.
aziz
parents: 80
diff changeset
1660 e = parseNewExpression(e);
92
6de2e6e7d872 - Fixed parsePostExpression().
aziz
parents: 91
diff changeset
1661 else
124
d4c4cea6ee7f - Renamed method errorIfNot() to expected().
aziz
parents: 123
diff changeset
1662 expected(T.Identifier);
93
9f8b6c205ecc - Made fixes to the way the while loop in parsePostExpression() works.
aziz
parents: 92
diff changeset
1663 continue;
154
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
1664 */
160
c21192e8be2b - Parsing PostDotListExpression in parsePostExpression().
aziz
parents: 159
diff changeset
1665 case T.Dot:
c21192e8be2b - Parsing PostDotListExpression in parsePostExpression().
aziz
parents: 159
diff changeset
1666 e = new PostDotListExpression(e, parseDotListExpression());
c21192e8be2b - Parsing PostDotListExpression in parsePostExpression().
aziz
parents: 159
diff changeset
1667 break;
79
df4e5c7ad58a - Implemented most of parsePostExpression() and parsePreExpression().
aziz
parents: 78
diff changeset
1668 case T.PlusPlus:
df4e5c7ad58a - Implemented most of parsePostExpression() and parsePreExpression().
aziz
parents: 78
diff changeset
1669 e = new PostIncrExpression(e);
df4e5c7ad58a - Implemented most of parsePostExpression() and parsePreExpression().
aziz
parents: 78
diff changeset
1670 break;
df4e5c7ad58a - Implemented most of parsePostExpression() and parsePreExpression().
aziz
parents: 78
diff changeset
1671 case T.MinusMinus:
df4e5c7ad58a - Implemented most of parsePostExpression() and parsePreExpression().
aziz
parents: 78
diff changeset
1672 e = new PostDecrExpression(e);
df4e5c7ad58a - Implemented most of parsePostExpression() and parsePreExpression().
aziz
parents: 78
diff changeset
1673 break;
df4e5c7ad58a - Implemented most of parsePostExpression() and parsePreExpression().
aziz
parents: 78
diff changeset
1674 case T.LParen:
154
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
1675 e = new CallExpression(e, parseArguments(T.RParen));
93
9f8b6c205ecc - Made fixes to the way the while loop in parsePostExpression() works.
aziz
parents: 92
diff changeset
1676 continue;
79
df4e5c7ad58a - Implemented most of parsePostExpression() and parsePreExpression().
aziz
parents: 78
diff changeset
1677 case T.LBracket:
df4e5c7ad58a - Implemented most of parsePostExpression() and parsePreExpression().
aziz
parents: 78
diff changeset
1678 // parse Slice- and IndexExpression
83
9e6d66f647c9 - Fix: IsExpression was created instead of IdentityExpression.
aziz
parents: 81
diff changeset
1679 nT();
87
c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token.
aziz
parents: 86
diff changeset
1680 if (token.type == T.RBracket)
83
9e6d66f647c9 - Fix: IsExpression was created instead of IdentityExpression.
aziz
parents: 81
diff changeset
1681 {
9e6d66f647c9 - Fix: IsExpression was created instead of IdentityExpression.
aziz
parents: 81
diff changeset
1682 e = new SliceExpression(e, null, null);
9e6d66f647c9 - Fix: IsExpression was created instead of IdentityExpression.
aziz
parents: 81
diff changeset
1683 break;
9e6d66f647c9 - Fix: IsExpression was created instead of IdentityExpression.
aziz
parents: 81
diff changeset
1684 }
87
c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token.
aziz
parents: 86
diff changeset
1685
83
9e6d66f647c9 - Fix: IsExpression was created instead of IdentityExpression.
aziz
parents: 81
diff changeset
1686 Expression[] es = [parseAssignExpression()];
87
c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token.
aziz
parents: 86
diff changeset
1687
c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token.
aziz
parents: 86
diff changeset
1688 if (token.type == T.Slice)
83
9e6d66f647c9 - Fix: IsExpression was created instead of IdentityExpression.
aziz
parents: 81
diff changeset
1689 {
9e6d66f647c9 - Fix: IsExpression was created instead of IdentityExpression.
aziz
parents: 81
diff changeset
1690 nT();
9e6d66f647c9 - Fix: IsExpression was created instead of IdentityExpression.
aziz
parents: 81
diff changeset
1691 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
1692 require(T.RBracket);
93
9f8b6c205ecc - Made fixes to the way the while loop in parsePostExpression() works.
aziz
parents: 92
diff changeset
1693 continue;
83
9e6d66f647c9 - Fix: IsExpression was created instead of IdentityExpression.
aziz
parents: 81
diff changeset
1694 }
87
c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token.
aziz
parents: 86
diff changeset
1695 else if (token.type == T.Comma)
83
9e6d66f647c9 - Fix: IsExpression was created instead of IdentityExpression.
aziz
parents: 81
diff changeset
1696 {
143
e760d7552f66 - Renamed parseArgumentList() to parseArguments().
aziz
parents: 141
diff changeset
1697 es ~= parseArguments(T.RBracket);
83
9e6d66f647c9 - Fix: IsExpression was created instead of IdentityExpression.
aziz
parents: 81
diff changeset
1698 }
85
d8dc3171440d - Fixed parsing CallExpression and IndexExpression.
aziz
parents: 84
diff changeset
1699 else
87
c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token.
aziz
parents: 86
diff changeset
1700 require(T.RBracket);
c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token.
aziz
parents: 86
diff changeset
1701
83
9e6d66f647c9 - Fix: IsExpression was created instead of IdentityExpression.
aziz
parents: 81
diff changeset
1702 e = new IndexExpression(e, es);
93
9f8b6c205ecc - Made fixes to the way the while loop in parsePostExpression() works.
aziz
parents: 92
diff changeset
1703 continue;
92
6de2e6e7d872 - Fixed parsePostExpression().
aziz
parents: 91
diff changeset
1704 default:
93
9f8b6c205ecc - Made fixes to the way the while loop in parsePostExpression() works.
aziz
parents: 92
diff changeset
1705 return e;
79
df4e5c7ad58a - Implemented most of parsePostExpression() and parsePreExpression().
aziz
parents: 78
diff changeset
1706 }
93
9f8b6c205ecc - Made fixes to the way the while loop in parsePostExpression() works.
aziz
parents: 92
diff changeset
1707 nT();
79
df4e5c7ad58a - Implemented most of parsePostExpression() and parsePreExpression().
aziz
parents: 78
diff changeset
1708 }
93
9f8b6c205ecc - Made fixes to the way the while loop in parsePostExpression() works.
aziz
parents: 92
diff changeset
1709 assert(0);
79
df4e5c7ad58a - Implemented most of parsePostExpression() and parsePreExpression().
aziz
parents: 78
diff changeset
1710 }
df4e5c7ad58a - Implemented most of parsePostExpression() and parsePreExpression().
aziz
parents: 78
diff changeset
1711
df4e5c7ad58a - Implemented most of parsePostExpression() and parsePreExpression().
aziz
parents: 78
diff changeset
1712 Expression parsePrimaryExpression()
78
f043759fb59a - Added code to parseUnaryExpression(); not fully implemented.
aziz
parents: 77
diff changeset
1713 {
83
9e6d66f647c9 - Fix: IsExpression was created instead of IdentityExpression.
aziz
parents: 81
diff changeset
1714 Expression e;
87
c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token.
aziz
parents: 86
diff changeset
1715 switch (token.type)
83
9e6d66f647c9 - Fix: IsExpression was created instead of IdentityExpression.
aziz
parents: 81
diff changeset
1716 {
154
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
1717 /*
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
1718 // Commented out because parseDotListExpression() handles this.
83
9e6d66f647c9 - Fix: IsExpression was created instead of IdentityExpression.
aziz
parents: 81
diff changeset
1719 case T.Identifier:
153
66790fc2c0a2 - Added method parseIdentifierListType().
aziz
parents: 152
diff changeset
1720 string ident = token.identifier;
89
18c71269fb52 - Added code for parsing IdentifierExpression.
aziz
parents: 88
diff changeset
1721 nT();
153
66790fc2c0a2 - Added method parseIdentifierListType().
aziz
parents: 152
diff changeset
1722 Token next;
66790fc2c0a2 - Added method parseIdentifierListType().
aziz
parents: 152
diff changeset
1723 lx.peek(next);
66790fc2c0a2 - Added method parseIdentifierListType().
aziz
parents: 152
diff changeset
1724 if (token.type == T.Not && next.type == T.LParen) // Identifier !( TemplateArguments )
66790fc2c0a2 - Added method parseIdentifierListType().
aziz
parents: 152
diff changeset
1725 {
66790fc2c0a2 - Added method parseIdentifierListType().
aziz
parents: 152
diff changeset
1726 nT(); // Skip !.
66790fc2c0a2 - Added method parseIdentifierListType().
aziz
parents: 152
diff changeset
1727 e = new TemplateInstanceExpression(ident, parseTemplateArguments());
66790fc2c0a2 - Added method parseIdentifierListType().
aziz
parents: 152
diff changeset
1728 }
66790fc2c0a2 - Added method parseIdentifierListType().
aziz
parents: 152
diff changeset
1729 else
66790fc2c0a2 - Added method parseIdentifierListType().
aziz
parents: 152
diff changeset
1730 e = new IdentifierExpression(ident);
84
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression.
aziz
parents: 83
diff changeset
1731 break;
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression.
aziz
parents: 83
diff changeset
1732 case T.Dot:
150
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument.
aziz
parents: 149
diff changeset
1733 nT();
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument.
aziz
parents: 149
diff changeset
1734 e = new IdentifierExpression(".");
84
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression.
aziz
parents: 83
diff changeset
1735 break;
154
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
1736 */
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
1737 case T.Identifier, T.Dot, T.Typeof:
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
1738 e = parseDotListExpression();
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
1739 break;
84
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression.
aziz
parents: 83
diff changeset
1740 case T.This:
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression.
aziz
parents: 83
diff changeset
1741 nT();
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression.
aziz
parents: 83
diff changeset
1742 e = new ThisExpression();
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression.
aziz
parents: 83
diff changeset
1743 break;
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression.
aziz
parents: 83
diff changeset
1744 case T.Super:
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression.
aziz
parents: 83
diff changeset
1745 nT();
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression.
aziz
parents: 83
diff changeset
1746 e = new SuperExpression();
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression.
aziz
parents: 83
diff changeset
1747 break;
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression.
aziz
parents: 83
diff changeset
1748 case T.Null:
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression.
aziz
parents: 83
diff changeset
1749 nT();
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression.
aziz
parents: 83
diff changeset
1750 e = new NullExpression();
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression.
aziz
parents: 83
diff changeset
1751 break;
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression.
aziz
parents: 83
diff changeset
1752 case T.True, T.False:
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression.
aziz
parents: 83
diff changeset
1753 nT();
87
c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token.
aziz
parents: 86
diff changeset
1754 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
1755 break;
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression.
aziz
parents: 83
diff changeset
1756 case T.Dollar:
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression.
aziz
parents: 83
diff changeset
1757 nT();
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression.
aziz
parents: 83
diff changeset
1758 e = new DollarExpression();
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression.
aziz
parents: 83
diff changeset
1759 break;
97
1a83e5070a84 - Added code for parsing IntNumber- and RealNumberExpressions.
aziz
parents: 96
diff changeset
1760 case T.Int32, T.Int64, T.Uint32, T.Uint64:
1a83e5070a84 - Added code for parsing IntNumber- and RealNumberExpressions.
aziz
parents: 96
diff changeset
1761 nT();
1a83e5070a84 - Added code for parsing IntNumber- and RealNumberExpressions.
aziz
parents: 96
diff changeset
1762 e = new IntNumberExpression(token.type, token.ulong_);
1a83e5070a84 - Added code for parsing IntNumber- and RealNumberExpressions.
aziz
parents: 96
diff changeset
1763 break;
1a83e5070a84 - Added code for parsing IntNumber- and RealNumberExpressions.
aziz
parents: 96
diff changeset
1764 case T.Float32, T.Float64, T.Float80,
1a83e5070a84 - Added code for parsing IntNumber- and RealNumberExpressions.
aziz
parents: 96
diff changeset
1765 T.Imaginary32, T.Imaginary64, T.Imaginary80:
1a83e5070a84 - Added code for parsing IntNumber- and RealNumberExpressions.
aziz
parents: 96
diff changeset
1766 nT();
1a83e5070a84 - Added code for parsing IntNumber- and RealNumberExpressions.
aziz
parents: 96
diff changeset
1767 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
1768 break;
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression.
aziz
parents: 83
diff changeset
1769 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
1770 nT();
87
c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token.
aziz
parents: 86
diff changeset
1771 e = new CharLiteralExpression(token.type);
84
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression.
aziz
parents: 83
diff changeset
1772 break;
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression.
aziz
parents: 83
diff changeset
1773 case T.String:
157
fdbd47d72614 - Renamed class StringLiteralExpression to StringLiteralsExpression.
aziz
parents: 156
diff changeset
1774 Token*[] stringLiterals;
fdbd47d72614 - Renamed class StringLiteralExpression to StringLiteralsExpression.
aziz
parents: 156
diff changeset
1775 do
84
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression.
aziz
parents: 83
diff changeset
1776 {
157
fdbd47d72614 - Renamed class StringLiteralExpression to StringLiteralsExpression.
aziz
parents: 156
diff changeset
1777 stringLiterals ~= token;
84
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression.
aziz
parents: 83
diff changeset
1778 nT();
157
fdbd47d72614 - Renamed class StringLiteralExpression to StringLiteralsExpression.
aziz
parents: 156
diff changeset
1779 } while (token.type == T.String)
fdbd47d72614 - Renamed class StringLiteralExpression to StringLiteralsExpression.
aziz
parents: 156
diff changeset
1780 e = new StringLiteralsExpression(stringLiterals);
84
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression.
aziz
parents: 83
diff changeset
1781 break;
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression.
aziz
parents: 83
diff changeset
1782 case T.LBracket:
85
d8dc3171440d - Fixed parsing CallExpression and IndexExpression.
aziz
parents: 84
diff changeset
1783 Expression[] values;
d8dc3171440d - Fixed parsing CallExpression and IndexExpression.
aziz
parents: 84
diff changeset
1784
d8dc3171440d - Fixed parsing CallExpression and IndexExpression.
aziz
parents: 84
diff changeset
1785 nT();
87
c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token.
aziz
parents: 86
diff changeset
1786 if (token.type != T.RBracket)
85
d8dc3171440d - Fixed parsing CallExpression and IndexExpression.
aziz
parents: 84
diff changeset
1787 {
d8dc3171440d - Fixed parsing CallExpression and IndexExpression.
aziz
parents: 84
diff changeset
1788 e = parseAssignExpression();
87
c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token.
aziz
parents: 86
diff changeset
1789 if (token.type == T.Colon)
85
d8dc3171440d - Fixed parsing CallExpression and IndexExpression.
aziz
parents: 84
diff changeset
1790 goto LparseAssocArray;
87
c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token.
aziz
parents: 86
diff changeset
1791 else if (token.type == T.Comma)
143
e760d7552f66 - Renamed parseArgumentList() to parseArguments().
aziz
parents: 141
diff changeset
1792 values = [e] ~ parseArguments(T.RBracket);
87
c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token.
aziz
parents: 86
diff changeset
1793 else
c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token.
aziz
parents: 86
diff changeset
1794 require(T.RBracket);
85
d8dc3171440d - Fixed parsing CallExpression and IndexExpression.
aziz
parents: 84
diff changeset
1795 }
d8dc3171440d - Fixed parsing CallExpression and IndexExpression.
aziz
parents: 84
diff changeset
1796
d8dc3171440d - Fixed parsing CallExpression and IndexExpression.
aziz
parents: 84
diff changeset
1797 e = new ArrayLiteralExpression(values);
d8dc3171440d - Fixed parsing CallExpression and IndexExpression.
aziz
parents: 84
diff changeset
1798 break;
d8dc3171440d - Fixed parsing CallExpression and IndexExpression.
aziz
parents: 84
diff changeset
1799
d8dc3171440d - Fixed parsing CallExpression and IndexExpression.
aziz
parents: 84
diff changeset
1800 LparseAssocArray:
d8dc3171440d - Fixed parsing CallExpression and IndexExpression.
aziz
parents: 84
diff changeset
1801 Expression[] keys;
d8dc3171440d - Fixed parsing CallExpression and IndexExpression.
aziz
parents: 84
diff changeset
1802
d8dc3171440d - Fixed parsing CallExpression and IndexExpression.
aziz
parents: 84
diff changeset
1803 keys ~= e;
d8dc3171440d - Fixed parsing CallExpression and IndexExpression.
aziz
parents: 84
diff changeset
1804 nT(); // Skip colon.
d8dc3171440d - Fixed parsing CallExpression and IndexExpression.
aziz
parents: 84
diff changeset
1805 values ~= parseAssignExpression();
d8dc3171440d - Fixed parsing CallExpression and IndexExpression.
aziz
parents: 84
diff changeset
1806
87
c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token.
aziz
parents: 86
diff changeset
1807 if (token.type != T.RBracket)
88
81cb24669ed3 - Fixed parser of AssocArrayLiteralExpression.
aziz
parents: 87
diff changeset
1808 {
81cb24669ed3 - Fixed parser of AssocArrayLiteralExpression.
aziz
parents: 87
diff changeset
1809 require(T.Comma);
85
d8dc3171440d - Fixed parsing CallExpression and IndexExpression.
aziz
parents: 84
diff changeset
1810 while (1)
d8dc3171440d - Fixed parsing CallExpression and IndexExpression.
aziz
parents: 84
diff changeset
1811 {
d8dc3171440d - Fixed parsing CallExpression and IndexExpression.
aziz
parents: 84
diff changeset
1812 keys ~= parseAssignExpression();
87
c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token.
aziz
parents: 86
diff changeset
1813 if (token.type != T.Colon)
85
d8dc3171440d - Fixed parsing CallExpression and IndexExpression.
aziz
parents: 84
diff changeset
1814 {
124
d4c4cea6ee7f - Renamed method errorIfNot() to expected().
aziz
parents: 123
diff changeset
1815 expected(T.Colon);
85
d8dc3171440d - Fixed parsing CallExpression and IndexExpression.
aziz
parents: 84
diff changeset
1816 values ~= null;
87
c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token.
aziz
parents: 86
diff changeset
1817 if (token.type == T.RBracket)
85
d8dc3171440d - Fixed parsing CallExpression and IndexExpression.
aziz
parents: 84
diff changeset
1818 break;
d8dc3171440d - Fixed parsing CallExpression and IndexExpression.
aziz
parents: 84
diff changeset
1819 else
d8dc3171440d - Fixed parsing CallExpression and IndexExpression.
aziz
parents: 84
diff changeset
1820 continue;
d8dc3171440d - Fixed parsing CallExpression and IndexExpression.
aziz
parents: 84
diff changeset
1821 }
d8dc3171440d - Fixed parsing CallExpression and IndexExpression.
aziz
parents: 84
diff changeset
1822 nT();
d8dc3171440d - Fixed parsing CallExpression and IndexExpression.
aziz
parents: 84
diff changeset
1823 values ~= parseAssignExpression();
87
c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token.
aziz
parents: 86
diff changeset
1824 if (token.type == T.RBracket)
85
d8dc3171440d - Fixed parsing CallExpression and IndexExpression.
aziz
parents: 84
diff changeset
1825 break;
88
81cb24669ed3 - Fixed parser of AssocArrayLiteralExpression.
aziz
parents: 87
diff changeset
1826 require(T.Comma);
85
d8dc3171440d - Fixed parsing CallExpression and IndexExpression.
aziz
parents: 84
diff changeset
1827 }
88
81cb24669ed3 - Fixed parser of AssocArrayLiteralExpression.
aziz
parents: 87
diff changeset
1828 }
87
c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token.
aziz
parents: 86
diff changeset
1829 assert(token.type == T.RBracket);
85
d8dc3171440d - Fixed parsing CallExpression and IndexExpression.
aziz
parents: 84
diff changeset
1830 nT();
d8dc3171440d - Fixed parsing CallExpression and IndexExpression.
aziz
parents: 84
diff changeset
1831 e = new AssocArrayLiteralExpression(keys, values);
84
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression.
aziz
parents: 83
diff changeset
1832 break;
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression.
aziz
parents: 83
diff changeset
1833 case T.LBrace:
133
3924b1ee1302 - Added code for parsing function and delegate literal expressions.
aziz
parents: 132
diff changeset
1834 // DelegateLiteral := { DeclDefs }
3924b1ee1302 - Added code for parsing function and delegate literal expressions.
aziz
parents: 132
diff changeset
1835 require(T.LBrace);
3924b1ee1302 - Added code for parsing function and delegate literal expressions.
aziz
parents: 132
diff changeset
1836 auto decls = parseDeclarationDefinitions();
3924b1ee1302 - Added code for parsing function and delegate literal expressions.
aziz
parents: 132
diff changeset
1837 require(T.RBrace);
3924b1ee1302 - Added code for parsing function and delegate literal expressions.
aziz
parents: 132
diff changeset
1838 auto func = new FunctionType(null, Parameters.init);
3924b1ee1302 - Added code for parsing function and delegate literal expressions.
aziz
parents: 132
diff changeset
1839 e = new FunctionLiteralExpression(func, decls);
84
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression.
aziz
parents: 83
diff changeset
1840 break;
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression.
aziz
parents: 83
diff changeset
1841 case T.Function, T.Delegate:
133
3924b1ee1302 - Added code for parsing function and delegate literal expressions.
aziz
parents: 132
diff changeset
1842 // FunctionLiteral := (function|delegate) Type? '(' ArgumentList ')' '{' DeclDefs '}'
3924b1ee1302 - Added code for parsing function and delegate literal expressions.
aziz
parents: 132
diff changeset
1843 TOK funcTok = token.type;
3924b1ee1302 - Added code for parsing function and delegate literal expressions.
aziz
parents: 132
diff changeset
1844 nT(); // Skip function|delegate token.
3924b1ee1302 - Added code for parsing function and delegate literal expressions.
aziz
parents: 132
diff changeset
1845 Type returnType;
3924b1ee1302 - Added code for parsing function and delegate literal expressions.
aziz
parents: 132
diff changeset
1846 Parameters parameters;
3924b1ee1302 - Added code for parsing function and delegate literal expressions.
aziz
parents: 132
diff changeset
1847 if (token.type != T.LBrace)
3924b1ee1302 - Added code for parsing function and delegate literal expressions.
aziz
parents: 132
diff changeset
1848 {
3924b1ee1302 - Added code for parsing function and delegate literal expressions.
aziz
parents: 132
diff changeset
1849 if (token.type != T.LParen) // Optional return type
3924b1ee1302 - Added code for parsing function and delegate literal expressions.
aziz
parents: 132
diff changeset
1850 returnType = parseType();
143
e760d7552f66 - Renamed parseArgumentList() to parseArguments().
aziz
parents: 141
diff changeset
1851 parameters = parseParameterList();
133
3924b1ee1302 - Added code for parsing function and delegate literal expressions.
aziz
parents: 132
diff changeset
1852 }
3924b1ee1302 - Added code for parsing function and delegate literal expressions.
aziz
parents: 132
diff changeset
1853 require(T.LBrace);
3924b1ee1302 - Added code for parsing function and delegate literal expressions.
aziz
parents: 132
diff changeset
1854 auto decls = parseDeclarationDefinitions();
3924b1ee1302 - Added code for parsing function and delegate literal expressions.
aziz
parents: 132
diff changeset
1855 require(T.RBrace);
3924b1ee1302 - Added code for parsing function and delegate literal expressions.
aziz
parents: 132
diff changeset
1856 auto func = new FunctionType(returnType, parameters);
3924b1ee1302 - Added code for parsing function and delegate literal expressions.
aziz
parents: 132
diff changeset
1857 e = new FunctionLiteralExpression(func, decls, funcTok);
84
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression.
aziz
parents: 83
diff changeset
1858 break;
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression.
aziz
parents: 83
diff changeset
1859 case T.Assert:
86
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions.
aziz
parents: 85
diff changeset
1860 Expression msg;
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions.
aziz
parents: 85
diff changeset
1861 requireNext(T.LParen);
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions.
aziz
parents: 85
diff changeset
1862 e = parseAssignExpression();
87
c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token.
aziz
parents: 86
diff changeset
1863 if (token.type == T.Comma)
86
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions.
aziz
parents: 85
diff changeset
1864 {
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions.
aziz
parents: 85
diff changeset
1865 nT();
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions.
aziz
parents: 85
diff changeset
1866 msg = parseAssignExpression();
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions.
aziz
parents: 85
diff changeset
1867 }
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions.
aziz
parents: 85
diff changeset
1868 require(T.RParen);
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions.
aziz
parents: 85
diff changeset
1869 e = new AssertExpression(e, msg);
84
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression.
aziz
parents: 83
diff changeset
1870 break;
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression.
aziz
parents: 83
diff changeset
1871 case T.Mixin:
86
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions.
aziz
parents: 85
diff changeset
1872 requireNext(T.LParen);
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions.
aziz
parents: 85
diff changeset
1873 e = parseAssignExpression();
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions.
aziz
parents: 85
diff changeset
1874 require(T.RParen);
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions.
aziz
parents: 85
diff changeset
1875 e = new MixinExpression(e);
84
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression.
aziz
parents: 83
diff changeset
1876 break;
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression.
aziz
parents: 83
diff changeset
1877 case T.Import:
86
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions.
aziz
parents: 85
diff changeset
1878 requireNext(T.LParen);
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions.
aziz
parents: 85
diff changeset
1879 e = parseAssignExpression();
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions.
aziz
parents: 85
diff changeset
1880 require(T.RParen);
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions.
aziz
parents: 85
diff changeset
1881 e = new ImportExpression(e);
84
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression.
aziz
parents: 83
diff changeset
1882 break;
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression.
aziz
parents: 83
diff changeset
1883 case T.Typeid:
86
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions.
aziz
parents: 85
diff changeset
1884 requireNext(T.LParen);
99
6b8c248f5911 - Added member type to classes CastExpression and TypeidExpression.
aziz
parents: 98
diff changeset
1885 auto type = parseType();
6b8c248f5911 - Added member type to classes CastExpression and TypeidExpression.
aziz
parents: 98
diff changeset
1886 require(T.RParen);
6b8c248f5911 - Added member type to classes CastExpression and TypeidExpression.
aziz
parents: 98
diff changeset
1887 e = new TypeidExpression(type);
84
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression.
aziz
parents: 83
diff changeset
1888 break;
154
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
1889 /*
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
1890 // Commented out because parseDotListExpression() handles this.
101
6f3c5473c5e5 - Implemented parsing TypeofExpression.
aziz
parents: 100
diff changeset
1891 case T.Typeof:
6f3c5473c5e5 - Implemented parsing TypeofExpression.
aziz
parents: 100
diff changeset
1892 requireNext(T.LParen);
6f3c5473c5e5 - Implemented parsing TypeofExpression.
aziz
parents: 100
diff changeset
1893 auto type = new TypeofType(parseExpression());
6f3c5473c5e5 - Implemented parsing TypeofExpression.
aziz
parents: 100
diff changeset
1894 require(T.RParen);
6f3c5473c5e5 - Implemented parsing TypeofExpression.
aziz
parents: 100
diff changeset
1895 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
1896 { // typeof ( Expression ) . Identifier
101
6f3c5473c5e5 - Implemented parsing TypeofExpression.
aziz
parents: 100
diff changeset
1897 nT();
115
cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier().
aziz
parents: 114
diff changeset
1898 string ident = requireIdentifier;
101
6f3c5473c5e5 - Implemented parsing TypeofExpression.
aziz
parents: 100
diff changeset
1899 e = new TypeDotIdExpression(type, ident);
6f3c5473c5e5 - Implemented parsing TypeofExpression.
aziz
parents: 100
diff changeset
1900 }
115
cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier().
aziz
parents: 114
diff changeset
1901 else // typeof ( Expression )
101
6f3c5473c5e5 - Implemented parsing TypeofExpression.
aziz
parents: 100
diff changeset
1902 e = new TypeofExpression(type);
6f3c5473c5e5 - Implemented parsing TypeofExpression.
aziz
parents: 100
diff changeset
1903 break;
154
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
1904 */
84
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression.
aziz
parents: 83
diff changeset
1905 case T.Is:
100
538e8b546669 - Added code for parsing IsExpressions.
aziz
parents: 99
diff changeset
1906 requireNext(T.LParen);
538e8b546669 - Added code for parsing IsExpressions.
aziz
parents: 99
diff changeset
1907
538e8b546669 - Added code for parsing IsExpressions.
aziz
parents: 99
diff changeset
1908 Type type;
538e8b546669 - Added code for parsing IsExpressions.
aziz
parents: 99
diff changeset
1909 SpecializationType specType;
538e8b546669 - Added code for parsing IsExpressions.
aziz
parents: 99
diff changeset
1910 string ident; // optional Identifier
538e8b546669 - Added code for parsing IsExpressions.
aziz
parents: 99
diff changeset
1911
538e8b546669 - Added code for parsing IsExpressions.
aziz
parents: 99
diff changeset
1912 type = parseDeclarator(ident, true);
538e8b546669 - Added code for parsing IsExpressions.
aziz
parents: 99
diff changeset
1913
538e8b546669 - Added code for parsing IsExpressions.
aziz
parents: 99
diff changeset
1914 switch (token.type)
538e8b546669 - Added code for parsing IsExpressions.
aziz
parents: 99
diff changeset
1915 {
538e8b546669 - Added code for parsing IsExpressions.
aziz
parents: 99
diff changeset
1916 case T.Colon, T.Equal:
538e8b546669 - Added code for parsing IsExpressions.
aziz
parents: 99
diff changeset
1917 TOK specTok = token.type;
538e8b546669 - Added code for parsing IsExpressions.
aziz
parents: 99
diff changeset
1918 nT();
538e8b546669 - Added code for parsing IsExpressions.
aziz
parents: 99
diff changeset
1919 switch (token.type)
538e8b546669 - Added code for parsing IsExpressions.
aziz
parents: 99
diff changeset
1920 {
538e8b546669 - Added code for parsing IsExpressions.
aziz
parents: 99
diff changeset
1921 case T.Typedef,
538e8b546669 - Added code for parsing IsExpressions.
aziz
parents: 99
diff changeset
1922 T.Struct,
538e8b546669 - Added code for parsing IsExpressions.
aziz
parents: 99
diff changeset
1923 T.Union,
538e8b546669 - Added code for parsing IsExpressions.
aziz
parents: 99
diff changeset
1924 T.Class,
538e8b546669 - Added code for parsing IsExpressions.
aziz
parents: 99
diff changeset
1925 T.Interface,
538e8b546669 - Added code for parsing IsExpressions.
aziz
parents: 99
diff changeset
1926 T.Enum,
538e8b546669 - Added code for parsing IsExpressions.
aziz
parents: 99
diff changeset
1927 T.Function,
538e8b546669 - Added code for parsing IsExpressions.
aziz
parents: 99
diff changeset
1928 T.Delegate,
538e8b546669 - Added code for parsing IsExpressions.
aziz
parents: 99
diff changeset
1929 T.Super,
538e8b546669 - Added code for parsing IsExpressions.
aziz
parents: 99
diff changeset
1930 T.Return:
102
6e8b67ae15b7 - Added modules Declarations and Statements.
aziz
parents: 101
diff changeset
1931 nT();
100
538e8b546669 - Added code for parsing IsExpressions.
aziz
parents: 99
diff changeset
1932 specType = new SpecializationType(specTok, token.type);
538e8b546669 - Added code for parsing IsExpressions.
aziz
parents: 99
diff changeset
1933 break;
538e8b546669 - Added code for parsing IsExpressions.
aziz
parents: 99
diff changeset
1934 default:
538e8b546669 - Added code for parsing IsExpressions.
aziz
parents: 99
diff changeset
1935 specType = new SpecializationType(specTok, parseType());
538e8b546669 - Added code for parsing IsExpressions.
aziz
parents: 99
diff changeset
1936 }
538e8b546669 - Added code for parsing IsExpressions.
aziz
parents: 99
diff changeset
1937 default:
538e8b546669 - Added code for parsing IsExpressions.
aziz
parents: 99
diff changeset
1938 }
102
6e8b67ae15b7 - Added modules Declarations and Statements.
aziz
parents: 101
diff changeset
1939 require(T.RParen);
100
538e8b546669 - Added code for parsing IsExpressions.
aziz
parents: 99
diff changeset
1940 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
1941 break;
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression.
aziz
parents: 83
diff changeset
1942 case T.LParen:
130
0467f01ed524 - Fix: parameters can have optional identifier.
aziz
parents: 129
diff changeset
1943 Token t;
0467f01ed524 - Fix: parameters can have optional identifier.
aziz
parents: 129
diff changeset
1944 bool failed;
143
e760d7552f66 - Renamed parseArgumentList() to parseArguments().
aziz
parents: 141
diff changeset
1945 auto parameters = try_(parseParameterList(), failed);
130
0467f01ed524 - Fix: parameters can have optional identifier.
aziz
parents: 129
diff changeset
1946 if (!failed)
0467f01ed524 - Fix: parameters can have optional identifier.
aziz
parents: 129
diff changeset
1947 {
143
e760d7552f66 - Renamed parseArgumentList() to parseArguments().
aziz
parents: 141
diff changeset
1948 // ( ParameterList ) FunctionBody
130
0467f01ed524 - Fix: parameters can have optional identifier.
aziz
parents: 129
diff changeset
1949 require(T.LBrace);
0467f01ed524 - Fix: parameters can have optional identifier.
aziz
parents: 129
diff changeset
1950 auto decls = parseDeclarationDefinitions();
0467f01ed524 - Fix: parameters can have optional identifier.
aziz
parents: 129
diff changeset
1951 require(T.RBrace);
0467f01ed524 - Fix: parameters can have optional identifier.
aziz
parents: 129
diff changeset
1952 auto func = new FunctionType(null, parameters);
0467f01ed524 - Fix: parameters can have optional identifier.
aziz
parents: 129
diff changeset
1953 e = new FunctionLiteralExpression(func, decls);
0467f01ed524 - Fix: parameters can have optional identifier.
aziz
parents: 129
diff changeset
1954 }
0467f01ed524 - Fix: parameters can have optional identifier.
aziz
parents: 129
diff changeset
1955 else
0467f01ed524 - Fix: parameters can have optional identifier.
aziz
parents: 129
diff changeset
1956 {
131
ce636f3981cc - Removed TOK.Number.
aziz
parents: 130
diff changeset
1957 // ( Expression )
130
0467f01ed524 - Fix: parameters can have optional identifier.
aziz
parents: 129
diff changeset
1958 nT();
0467f01ed524 - Fix: parameters can have optional identifier.
aziz
parents: 129
diff changeset
1959 e = parseExpression();
0467f01ed524 - Fix: parameters can have optional identifier.
aziz
parents: 129
diff changeset
1960 require(T.RParen);
0467f01ed524 - Fix: parameters can have optional identifier.
aziz
parents: 129
diff changeset
1961 }
84
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression.
aziz
parents: 83
diff changeset
1962 break;
86
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions.
aziz
parents: 85
diff changeset
1963 // BasicType . Identifier
94
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information.
aziz
parents: 93
diff changeset
1964 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
1965 T.Byte, T.Ubyte, T.Short, T.Ushort,
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information.
aziz
parents: 93
diff changeset
1966 T.Int, T.Uint, T.Long, T.Ulong,
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information.
aziz
parents: 93
diff changeset
1967 T.Float, T.Double, T.Real,
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information.
aziz
parents: 93
diff changeset
1968 T.Ifloat, T.Idouble, T.Ireal,
86
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions.
aziz
parents: 85
diff changeset
1969 T.Cfloat, T.Cdouble, T.Creal:
94
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information.
aziz
parents: 93
diff changeset
1970 auto type = new Type(token.type);
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information.
aziz
parents: 93
diff changeset
1971 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
1972 auto ident = requireIdentifier();
86
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions.
aziz
parents: 85
diff changeset
1973
94
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information.
aziz
parents: 93
diff changeset
1974 e = new TypeDotIdExpression(type, ident);
98
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement.
aziz
parents: 97
diff changeset
1975 break;
84
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression.
aziz
parents: 83
diff changeset
1976 default:
136
96468715ea79 - Returning EmptyExpression in parsePrimaryExpression() when no token matched.
aziz
parents: 135
diff changeset
1977 // TODO: issue error msg.
96468715ea79 - Returning EmptyExpression in parsePrimaryExpression() when no token matched.
aziz
parents: 135
diff changeset
1978 e = new EmptyExpression();
83
9e6d66f647c9 - Fix: IsExpression was created instead of IdentityExpression.
aziz
parents: 81
diff changeset
1979 }
9e6d66f647c9 - Fix: IsExpression was created instead of IdentityExpression.
aziz
parents: 81
diff changeset
1980 return e;
77
7e21c4df1c02 - Implemented parseMulExpression().
aziz
parents: 76
diff changeset
1981 }
7e21c4df1c02 - Implemented parseMulExpression().
aziz
parents: 76
diff changeset
1982
154
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
1983 Expression parseNewExpression(/*Expression e*/)
81
aa1ea2548dd9 - Fixed parseExpression() method.
aziz
parents: 80
diff changeset
1984 {
144
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon.
aziz
parents: 143
diff changeset
1985 assert(token.type == T.New);
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon.
aziz
parents: 143
diff changeset
1986 nT(); // Skip new keyword.
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon.
aziz
parents: 143
diff changeset
1987
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon.
aziz
parents: 143
diff changeset
1988 Expression[] newArguments;
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon.
aziz
parents: 143
diff changeset
1989 Expression[] ctorArguments;
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon.
aziz
parents: 143
diff changeset
1990
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon.
aziz
parents: 143
diff changeset
1991 if (token.type == T.LParen)
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon.
aziz
parents: 143
diff changeset
1992 newArguments = parseArguments(T.RParen);
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon.
aziz
parents: 143
diff changeset
1993
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon.
aziz
parents: 143
diff changeset
1994 // NewAnonClassExpression:
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon.
aziz
parents: 143
diff changeset
1995 // new (ArgumentList)opt class (ArgumentList)opt SuperClassopt InterfaceClassesopt ClassBody
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon.
aziz
parents: 143
diff changeset
1996 if (token.type == T.Class)
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon.
aziz
parents: 143
diff changeset
1997 {
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon.
aziz
parents: 143
diff changeset
1998 nT();
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon.
aziz
parents: 143
diff changeset
1999 if (token.type == T.LParen)
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon.
aziz
parents: 143
diff changeset
2000 ctorArguments = parseArguments(T.RParen);
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon.
aziz
parents: 143
diff changeset
2001
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon.
aziz
parents: 143
diff changeset
2002 BaseClass[] bases = token.type != T.LBrace ? parseBaseClasses(false) : null ;
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon.
aziz
parents: 143
diff changeset
2003
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon.
aziz
parents: 143
diff changeset
2004 require(T.LBrace);
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon.
aziz
parents: 143
diff changeset
2005 auto decls = parseDeclarationDefinitions();
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon.
aziz
parents: 143
diff changeset
2006 require(T.RBrace);
154
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
2007 return new NewAnonClassExpression(/*e, */newArguments, bases, ctorArguments, decls);
144
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon.
aziz
parents: 143
diff changeset
2008 }
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon.
aziz
parents: 143
diff changeset
2009
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon.
aziz
parents: 143
diff changeset
2010 // NewExpression:
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon.
aziz
parents: 143
diff changeset
2011 // NewArguments Type [ AssignExpression ]
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon.
aziz
parents: 143
diff changeset
2012 // NewArguments Type ( ArgumentList )
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon.
aziz
parents: 143
diff changeset
2013 // NewArguments Type
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon.
aziz
parents: 143
diff changeset
2014 auto type = parseType();
156
53c667aabbf2 - parseNewExpression(): constructor arguments should only be parsed when the Type is a DotListType and when '(' is found.
aziz
parents: 155
diff changeset
2015 if (type.tid == TID.DotList && token.type == T.LParen)
144
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon.
aziz
parents: 143
diff changeset
2016 {
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon.
aziz
parents: 143
diff changeset
2017 ctorArguments = parseArguments(T.RParen);
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon.
aziz
parents: 143
diff changeset
2018 }
154
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
2019 return new NewExpression(/*e, */newArguments, type, ctorArguments);
81
aa1ea2548dd9 - Fixed parseExpression() method.
aziz
parents: 80
diff changeset
2020 }
aa1ea2548dd9 - Fixed parseExpression() method.
aziz
parents: 80
diff changeset
2021
98
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement.
aziz
parents: 97
diff changeset
2022 Type parseType()
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement.
aziz
parents: 97
diff changeset
2023 {
104
b535016f8c3f - DeclaratorSuffix must be parsed after an Identifier.
aziz
parents: 103
diff changeset
2024 return parseBasicType2(parseBasicType());
98
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement.
aziz
parents: 97
diff changeset
2025 }
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement.
aziz
parents: 97
diff changeset
2026
94
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information.
aziz
parents: 93
diff changeset
2027 Type parseBasicType()
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information.
aziz
parents: 93
diff changeset
2028 {
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information.
aziz
parents: 93
diff changeset
2029 Type t;
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information.
aziz
parents: 93
diff changeset
2030 IdentifierType tident;
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information.
aziz
parents: 93
diff changeset
2031
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information.
aziz
parents: 93
diff changeset
2032 switch (token.type)
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information.
aziz
parents: 93
diff changeset
2033 {
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information.
aziz
parents: 93
diff changeset
2034 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
2035 T.Byte, T.Ubyte, T.Short, T.Ushort,
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information.
aziz
parents: 93
diff changeset
2036 T.Int, T.Uint, T.Long, T.Ulong,
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information.
aziz
parents: 93
diff changeset
2037 T.Float, T.Double, T.Real,
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information.
aziz
parents: 93
diff changeset
2038 T.Ifloat, T.Idouble, T.Ireal,
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information.
aziz
parents: 93
diff changeset
2039 T.Cfloat, T.Cdouble, T.Creal:
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information.
aziz
parents: 93
diff changeset
2040 t = new Type(token.type);
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information.
aziz
parents: 93
diff changeset
2041 nT();
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information.
aziz
parents: 93
diff changeset
2042 break;
153
66790fc2c0a2 - Added method parseIdentifierListType().
aziz
parents: 152
diff changeset
2043 /+
94
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information.
aziz
parents: 93
diff changeset
2044 case T.Identifier, T.Dot:
107
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration.
aziz
parents: 106
diff changeset
2045 tident = new IdentifierType([token.identifier]);
94
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information.
aziz
parents: 93
diff changeset
2046 nT();
102
6e8b67ae15b7 - Added modules Declarations and Statements.
aziz
parents: 101
diff changeset
2047 // TODO: parse template instance
94
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information.
aziz
parents: 93
diff changeset
2048 // if (token.type == T.Not)
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information.
aziz
parents: 93
diff changeset
2049 // parse template instance
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information.
aziz
parents: 93
diff changeset
2050 Lident:
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information.
aziz
parents: 93
diff changeset
2051 while (token.type == T.Dot)
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information.
aziz
parents: 93
diff changeset
2052 {
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information.
aziz
parents: 93
diff changeset
2053 nT();
115
cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier().
aziz
parents: 114
diff changeset
2054 tident ~= requireIdentifier();
102
6e8b67ae15b7 - Added modules Declarations and Statements.
aziz
parents: 101
diff changeset
2055 // TODO: parse template instance
94
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information.
aziz
parents: 93
diff changeset
2056 // if (token.type == T.Not)
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information.
aziz
parents: 93
diff changeset
2057 // parse template instance
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information.
aziz
parents: 93
diff changeset
2058 }
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information.
aziz
parents: 93
diff changeset
2059 t = tident;
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information.
aziz
parents: 93
diff changeset
2060 break;
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information.
aziz
parents: 93
diff changeset
2061 case T.Typeof:
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information.
aziz
parents: 93
diff changeset
2062 requireNext(T.LParen);
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information.
aziz
parents: 93
diff changeset
2063 tident = new TypeofType(parseExpression());
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information.
aziz
parents: 93
diff changeset
2064 require(T.RParen);
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information.
aziz
parents: 93
diff changeset
2065 goto Lident;
153
66790fc2c0a2 - Added method parseIdentifierListType().
aziz
parents: 152
diff changeset
2066 +/
66790fc2c0a2 - Added method parseIdentifierListType().
aziz
parents: 152
diff changeset
2067 case T.Identifier, T.Typeof, T.Dot:
154
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
2068 t = parseDotListType();
153
66790fc2c0a2 - Added method parseIdentifierListType().
aziz
parents: 152
diff changeset
2069 break;
94
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information.
aziz
parents: 93
diff changeset
2070 default:
136
96468715ea79 - Returning EmptyExpression in parsePrimaryExpression() when no token matched.
aziz
parents: 135
diff changeset
2071 // TODO: issue error msg.
134
a31aa0d6dd5e - Added class UndefinedType. Returning it in parseBasicType() when no token matched the basic type list.
aziz
parents: 133
diff changeset
2072 t = new UndefinedType();
94
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information.
aziz
parents: 93
diff changeset
2073 }
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information.
aziz
parents: 93
diff changeset
2074 return t;
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information.
aziz
parents: 93
diff changeset
2075 }
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information.
aziz
parents: 93
diff changeset
2076
95
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
2077 Type parseBasicType2(Type t)
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
2078 {
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
2079 while (1)
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
2080 {
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
2081 switch (token.type)
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
2082 {
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
2083 case T.Mul:
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
2084 t = new PointerType(t);
98
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement.
aziz
parents: 97
diff changeset
2085 nT();
95
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
2086 break;
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
2087 case T.LBracket:
106
441962b0f526 - Added parseArrayType() method.
aziz
parents: 105
diff changeset
2088 t = parseArrayType(t);
98
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement.
aziz
parents: 97
diff changeset
2089 break;
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement.
aziz
parents: 97
diff changeset
2090 case T.Function, T.Delegate:
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement.
aziz
parents: 97
diff changeset
2091 TOK tok = token.type;
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement.
aziz
parents: 97
diff changeset
2092 nT();
143
e760d7552f66 - Renamed parseArgumentList() to parseArguments().
aziz
parents: 141
diff changeset
2093 auto parameters = parseParameterList();
135
145e0d68ec95 - Added enum TID to module Type.
aziz
parents: 134
diff changeset
2094 t = new FunctionType(t, parameters);
145e0d68ec95 - Added enum TID to module Type.
aziz
parents: 134
diff changeset
2095 if (tok == T.Function)
145e0d68ec95 - Added enum TID to module Type.
aziz
parents: 134
diff changeset
2096 t = new PointerType(t);
145e0d68ec95 - Added enum TID to module Type.
aziz
parents: 134
diff changeset
2097 else
145e0d68ec95 - Added enum TID to module Type.
aziz
parents: 134
diff changeset
2098 t = new DelegateType(t);
98
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement.
aziz
parents: 97
diff changeset
2099 break;
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement.
aziz
parents: 97
diff changeset
2100 default:
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement.
aziz
parents: 97
diff changeset
2101 return t;
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement.
aziz
parents: 97
diff changeset
2102 }
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement.
aziz
parents: 97
diff changeset
2103 }
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement.
aziz
parents: 97
diff changeset
2104 assert(0);
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement.
aziz
parents: 97
diff changeset
2105 }
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement.
aziz
parents: 97
diff changeset
2106
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement.
aziz
parents: 97
diff changeset
2107 Type parseDeclaratorSuffix(Type t)
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement.
aziz
parents: 97
diff changeset
2108 {
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement.
aziz
parents: 97
diff changeset
2109 while (1)
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement.
aziz
parents: 97
diff changeset
2110 {
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement.
aziz
parents: 97
diff changeset
2111 switch (token.type)
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement.
aziz
parents: 97
diff changeset
2112 {
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement.
aziz
parents: 97
diff changeset
2113 case T.LBracket:
131
ce636f3981cc - Removed TOK.Number.
aziz
parents: 130
diff changeset
2114 // Type Identifier ArrayType
ce636f3981cc - Removed TOK.Number.
aziz
parents: 130
diff changeset
2115 // ArrayType := [] or [Type] or [Expression..Expression]
106
441962b0f526 - Added parseArrayType() method.
aziz
parents: 105
diff changeset
2116 t = parseArrayType(t);
95
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
2117 continue;
98
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement.
aziz
parents: 97
diff changeset
2118 case T.LParen:
143
e760d7552f66 - Renamed parseArgumentList() to parseArguments().
aziz
parents: 141
diff changeset
2119 auto params = parseParameterList();
131
ce636f3981cc - Removed TOK.Number.
aziz
parents: 130
diff changeset
2120 // TODO: handle ( TemplateParameterList ) ( ParameterList )
ce636f3981cc - Removed TOK.Number.
aziz
parents: 130
diff changeset
2121 // ReturnType FunctionName ( ParameterList )
ce636f3981cc - Removed TOK.Number.
aziz
parents: 130
diff changeset
2122 t = new FunctionType(t, params);
98
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement.
aziz
parents: 97
diff changeset
2123 break;
100
538e8b546669 - Added code for parsing IsExpressions.
aziz
parents: 99
diff changeset
2124 default:
538e8b546669 - Added code for parsing IsExpressions.
aziz
parents: 99
diff changeset
2125 break;
95
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
2126 }
98
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement.
aziz
parents: 97
diff changeset
2127 break;
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement.
aziz
parents: 97
diff changeset
2128 }
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement.
aziz
parents: 97
diff changeset
2129 return t;
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement.
aziz
parents: 97
diff changeset
2130 }
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement.
aziz
parents: 97
diff changeset
2131
106
441962b0f526 - Added parseArrayType() method.
aziz
parents: 105
diff changeset
2132 Type parseArrayType(Type t)
441962b0f526 - Added parseArrayType() method.
aziz
parents: 105
diff changeset
2133 {
441962b0f526 - Added parseArrayType() method.
aziz
parents: 105
diff changeset
2134 assert(token.type == T.LBracket);
441962b0f526 - Added parseArrayType() method.
aziz
parents: 105
diff changeset
2135 nT();
441962b0f526 - Added parseArrayType() method.
aziz
parents: 105
diff changeset
2136 if (token.type == T.RBracket)
441962b0f526 - Added parseArrayType() method.
aziz
parents: 105
diff changeset
2137 {
441962b0f526 - Added parseArrayType() method.
aziz
parents: 105
diff changeset
2138 t = new ArrayType(t);
441962b0f526 - Added parseArrayType() method.
aziz
parents: 105
diff changeset
2139 nT();
441962b0f526 - Added parseArrayType() method.
aziz
parents: 105
diff changeset
2140 }
441962b0f526 - Added parseArrayType() method.
aziz
parents: 105
diff changeset
2141 else
441962b0f526 - Added parseArrayType() method.
aziz
parents: 105
diff changeset
2142 {
441962b0f526 - Added parseArrayType() method.
aziz
parents: 105
diff changeset
2143 bool failed;
441962b0f526 - Added parseArrayType() method.
aziz
parents: 105
diff changeset
2144 auto assocType = try_(parseType(), failed);
441962b0f526 - Added parseArrayType() method.
aziz
parents: 105
diff changeset
2145 if (!failed)
441962b0f526 - Added parseArrayType() method.
aziz
parents: 105
diff changeset
2146 t = new ArrayType(t, assocType);
441962b0f526 - Added parseArrayType() method.
aziz
parents: 105
diff changeset
2147 else
441962b0f526 - Added parseArrayType() method.
aziz
parents: 105
diff changeset
2148 {
441962b0f526 - Added parseArrayType() method.
aziz
parents: 105
diff changeset
2149 Expression e = parseExpression(), e2;
441962b0f526 - Added parseArrayType() method.
aziz
parents: 105
diff changeset
2150 if (token.type == T.Slice)
441962b0f526 - Added parseArrayType() method.
aziz
parents: 105
diff changeset
2151 {
441962b0f526 - Added parseArrayType() method.
aziz
parents: 105
diff changeset
2152 nT();
441962b0f526 - Added parseArrayType() method.
aziz
parents: 105
diff changeset
2153 e2 = parseExpression();
441962b0f526 - Added parseArrayType() method.
aziz
parents: 105
diff changeset
2154 }
441962b0f526 - Added parseArrayType() method.
aziz
parents: 105
diff changeset
2155 t = new ArrayType(t, e, e2);
441962b0f526 - Added parseArrayType() method.
aziz
parents: 105
diff changeset
2156 }
441962b0f526 - Added parseArrayType() method.
aziz
parents: 105
diff changeset
2157 require(T.RBracket);
441962b0f526 - Added parseArrayType() method.
aziz
parents: 105
diff changeset
2158 }
441962b0f526 - Added parseArrayType() method.
aziz
parents: 105
diff changeset
2159 return t;
441962b0f526 - Added parseArrayType() method.
aziz
parents: 105
diff changeset
2160 }
441962b0f526 - Added parseArrayType() method.
aziz
parents: 105
diff changeset
2161
100
538e8b546669 - Added code for parsing IsExpressions.
aziz
parents: 99
diff changeset
2162 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
2163 {
104
b535016f8c3f - DeclaratorSuffix must be parsed after an Identifier.
aziz
parents: 103
diff changeset
2164 auto t = parseType();
98
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement.
aziz
parents: 97
diff changeset
2165
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement.
aziz
parents: 97
diff changeset
2166 if (token.type == T.Identifier)
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement.
aziz
parents: 97
diff changeset
2167 {
107
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration.
aziz
parents: 106
diff changeset
2168 ident = token.identifier;
95
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
2169 nT();
104
b535016f8c3f - DeclaratorSuffix must be parsed after an Identifier.
aziz
parents: 103
diff changeset
2170 t = parseDeclaratorSuffix(t);
95
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
2171 }
100
538e8b546669 - Added code for parsing IsExpressions.
aziz
parents: 99
diff changeset
2172 else if (!identOptional)
124
d4c4cea6ee7f - Renamed method errorIfNot() to expected().
aziz
parents: 123
diff changeset
2173 expected(T.Identifier);
98
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement.
aziz
parents: 97
diff changeset
2174
104
b535016f8c3f - DeclaratorSuffix must be parsed after an Identifier.
aziz
parents: 103
diff changeset
2175 return t;
95
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
2176 }
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
2177
143
e760d7552f66 - Renamed parseArgumentList() to parseArguments().
aziz
parents: 141
diff changeset
2178 Expression[] parseArguments(TOK terminator)
138
91b5187ed775 - Moved parseArgumentList() down a bit.
aziz
parents: 137
diff changeset
2179 {
155
cd4394ef4b59 - Added two asserts to parseArguments().
aziz
parents: 154
diff changeset
2180 assert(token.type == T.LParen || token.type == T.LBracket || token.type == T.Comma);
cd4394ef4b59 - Added two asserts to parseArguments().
aziz
parents: 154
diff changeset
2181 assert(terminator == T.RParen || terminator == T.RBracket);
139
d48f345b05f8 - Implemented parseTemplateArgumentList().
aziz
parents: 138
diff changeset
2182 Expression[] args;
138
91b5187ed775 - Moved parseArgumentList() down a bit.
aziz
parents: 137
diff changeset
2183
91b5187ed775 - Moved parseArgumentList() down a bit.
aziz
parents: 137
diff changeset
2184 nT();
91b5187ed775 - Moved parseArgumentList() down a bit.
aziz
parents: 137
diff changeset
2185 if (token.type == terminator)
91b5187ed775 - Moved parseArgumentList() down a bit.
aziz
parents: 137
diff changeset
2186 {
91b5187ed775 - Moved parseArgumentList() down a bit.
aziz
parents: 137
diff changeset
2187 nT();
91b5187ed775 - Moved parseArgumentList() down a bit.
aziz
parents: 137
diff changeset
2188 return null;
91b5187ed775 - Moved parseArgumentList() down a bit.
aziz
parents: 137
diff changeset
2189 }
91b5187ed775 - Moved parseArgumentList() down a bit.
aziz
parents: 137
diff changeset
2190
139
d48f345b05f8 - Implemented parseTemplateArgumentList().
aziz
parents: 138
diff changeset
2191 goto LenterLoop;
d48f345b05f8 - Implemented parseTemplateArgumentList().
aziz
parents: 138
diff changeset
2192 do
138
91b5187ed775 - Moved parseArgumentList() down a bit.
aziz
parents: 137
diff changeset
2193 {
139
d48f345b05f8 - Implemented parseTemplateArgumentList().
aziz
parents: 138
diff changeset
2194 nT();
d48f345b05f8 - Implemented parseTemplateArgumentList().
aziz
parents: 138
diff changeset
2195 LenterLoop:
d48f345b05f8 - Implemented parseTemplateArgumentList().
aziz
parents: 138
diff changeset
2196 args ~= parseAssignExpression();
d48f345b05f8 - Implemented parseTemplateArgumentList().
aziz
parents: 138
diff changeset
2197 } while (token.type == T.Comma)
d48f345b05f8 - Implemented parseTemplateArgumentList().
aziz
parents: 138
diff changeset
2198
d48f345b05f8 - Implemented parseTemplateArgumentList().
aziz
parents: 138
diff changeset
2199 require(terminator);
d48f345b05f8 - Implemented parseTemplateArgumentList().
aziz
parents: 138
diff changeset
2200 return args;
138
91b5187ed775 - Moved parseArgumentList() down a bit.
aziz
parents: 137
diff changeset
2201 }
91b5187ed775 - Moved parseArgumentList() down a bit.
aziz
parents: 137
diff changeset
2202
143
e760d7552f66 - Renamed parseArgumentList() to parseArguments().
aziz
parents: 141
diff changeset
2203 Parameters parseParameterList()
117
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters.
aziz
parents: 116
diff changeset
2204 out(params)
96
d12d31d5fc17 - Added out-contract to parseParameters().
aziz
parents: 95
diff changeset
2205 {
117
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters.
aziz
parents: 116
diff changeset
2206 if (params.length > 1)
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters.
aziz
parents: 116
diff changeset
2207 foreach (param; params.items[0..$-1])
96
d12d31d5fc17 - Added out-contract to parseParameters().
aziz
parents: 95
diff changeset
2208 {
117
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters.
aziz
parents: 116
diff changeset
2209 if (param.isVariadic())
96
d12d31d5fc17 - Added out-contract to parseParameters().
aziz
parents: 95
diff changeset
2210 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
2211 }
d12d31d5fc17 - Added out-contract to parseParameters().
aziz
parents: 95
diff changeset
2212 }
d12d31d5fc17 - Added out-contract to parseParameters().
aziz
parents: 95
diff changeset
2213 body
95
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
2214 {
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
2215 require(T.LParen);
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
2216
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
2217 if (token.type == T.RParen)
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
2218 {
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
2219 nT();
117
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters.
aziz
parents: 116
diff changeset
2220 return Parameters.init;
95
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
2221 }
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
2222
117
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters.
aziz
parents: 116
diff changeset
2223 Parameters params;
95
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
2224 StorageClass stc;
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
2225
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
2226 while (1)
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
2227 {
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
2228 stc = StorageClass.In;
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
2229 switch (token.type)
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
2230 {
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
2231 case T.In: stc = StorageClass.In; nT(); goto default;
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
2232 case T.Out: stc = StorageClass.Out; nT(); goto default;
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
2233 case T.Ref: stc = StorageClass.Ref; nT(); goto default;
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
2234 case T.Lazy: stc = StorageClass.Lazy; nT(); goto default;
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
2235 case T.Ellipses:
117
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters.
aziz
parents: 116
diff changeset
2236 params ~= new Parameter(StorageClass.Variadic, null, null, null);
95
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
2237 break;
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
2238 default:
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
2239 string ident;
130
0467f01ed524 - Fix: parameters can have optional identifier.
aziz
parents: 129
diff changeset
2240 auto type = parseDeclarator(ident, true);
99
6b8c248f5911 - Added member type to classes CastExpression and TypeidExpression.
aziz
parents: 98
diff changeset
2241
95
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
2242 Expression assignExpr;
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
2243 if (token.type == T.Assign)
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
2244 {
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
2245 nT();
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
2246 assignExpr = parseAssignExpression();
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
2247 }
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
2248
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
2249 if (token.type == T.Ellipses)
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
2250 {
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
2251 stc |= StorageClass.Variadic;
117
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters.
aziz
parents: 116
diff changeset
2252 params ~= new Parameter(stc, type, ident, assignExpr);
95
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
2253 nT();
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
2254 break;
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
2255 }
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
2256
117
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters.
aziz
parents: 116
diff changeset
2257 params ~= new Parameter(stc, type, ident, assignExpr);
95
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
2258 if (token.type == T.Comma)
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
2259 {
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
2260 nT();
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
2261 continue;
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
2262 }
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
2263 break;
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
2264 }
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
2265 break;
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
2266 }
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
2267 require(T.RParen);
117
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters.
aziz
parents: 116
diff changeset
2268 return params;
95
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
2269 }
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
2270
150
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument.
aziz
parents: 149
diff changeset
2271 TemplateArguments parseTemplateArguments()
139
d48f345b05f8 - Implemented parseTemplateArgumentList().
aziz
parents: 138
diff changeset
2272 {
150
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument.
aziz
parents: 149
diff changeset
2273 TemplateArguments args;
139
d48f345b05f8 - Implemented parseTemplateArgumentList().
aziz
parents: 138
diff changeset
2274
d48f345b05f8 - Implemented parseTemplateArgumentList().
aziz
parents: 138
diff changeset
2275 require(T.LParen);
d48f345b05f8 - Implemented parseTemplateArgumentList().
aziz
parents: 138
diff changeset
2276 if (token.type == T.RParen)
d48f345b05f8 - Implemented parseTemplateArgumentList().
aziz
parents: 138
diff changeset
2277 {
d48f345b05f8 - Implemented parseTemplateArgumentList().
aziz
parents: 138
diff changeset
2278 nT();
d48f345b05f8 - Implemented parseTemplateArgumentList().
aziz
parents: 138
diff changeset
2279 return null;
d48f345b05f8 - Implemented parseTemplateArgumentList().
aziz
parents: 138
diff changeset
2280 }
d48f345b05f8 - Implemented parseTemplateArgumentList().
aziz
parents: 138
diff changeset
2281
d48f345b05f8 - Implemented parseTemplateArgumentList().
aziz
parents: 138
diff changeset
2282 goto LenterLoop;
d48f345b05f8 - Implemented parseTemplateArgumentList().
aziz
parents: 138
diff changeset
2283 do
d48f345b05f8 - Implemented parseTemplateArgumentList().
aziz
parents: 138
diff changeset
2284 {
d48f345b05f8 - Implemented parseTemplateArgumentList().
aziz
parents: 138
diff changeset
2285 nT(); // Skip comma.
d48f345b05f8 - Implemented parseTemplateArgumentList().
aziz
parents: 138
diff changeset
2286 LenterLoop:
d48f345b05f8 - Implemented parseTemplateArgumentList().
aziz
parents: 138
diff changeset
2287
d48f345b05f8 - Implemented parseTemplateArgumentList().
aziz
parents: 138
diff changeset
2288 bool failed;
d48f345b05f8 - Implemented parseTemplateArgumentList().
aziz
parents: 138
diff changeset
2289 auto typeArgument = try_(parseType(), failed);
d48f345b05f8 - Implemented parseTemplateArgumentList().
aziz
parents: 138
diff changeset
2290
d48f345b05f8 - Implemented parseTemplateArgumentList().
aziz
parents: 138
diff changeset
2291 if (!failed)
d48f345b05f8 - Implemented parseTemplateArgumentList().
aziz
parents: 138
diff changeset
2292 {
d48f345b05f8 - Implemented parseTemplateArgumentList().
aziz
parents: 138
diff changeset
2293 // TemplateArgument:
d48f345b05f8 - Implemented parseTemplateArgumentList().
aziz
parents: 138
diff changeset
2294 // Type
d48f345b05f8 - Implemented parseTemplateArgumentList().
aziz
parents: 138
diff changeset
2295 // Symbol
d48f345b05f8 - Implemented parseTemplateArgumentList().
aziz
parents: 138
diff changeset
2296 args ~= typeArgument;
d48f345b05f8 - Implemented parseTemplateArgumentList().
aziz
parents: 138
diff changeset
2297 }
d48f345b05f8 - Implemented parseTemplateArgumentList().
aziz
parents: 138
diff changeset
2298 else
d48f345b05f8 - Implemented parseTemplateArgumentList().
aziz
parents: 138
diff changeset
2299 {
d48f345b05f8 - Implemented parseTemplateArgumentList().
aziz
parents: 138
diff changeset
2300 // TemplateArgument:
d48f345b05f8 - Implemented parseTemplateArgumentList().
aziz
parents: 138
diff changeset
2301 // AssignExpression
d48f345b05f8 - Implemented parseTemplateArgumentList().
aziz
parents: 138
diff changeset
2302 args ~= parseAssignExpression();
d48f345b05f8 - Implemented parseTemplateArgumentList().
aziz
parents: 138
diff changeset
2303 }
d48f345b05f8 - Implemented parseTemplateArgumentList().
aziz
parents: 138
diff changeset
2304 } while (token.type == T.Comma)
d48f345b05f8 - Implemented parseTemplateArgumentList().
aziz
parents: 138
diff changeset
2305
d48f345b05f8 - Implemented parseTemplateArgumentList().
aziz
parents: 138
diff changeset
2306 require(T.RParen);
d48f345b05f8 - Implemented parseTemplateArgumentList().
aziz
parents: 138
diff changeset
2307 return args;
d48f345b05f8 - Implemented parseTemplateArgumentList().
aziz
parents: 138
diff changeset
2308 }
d48f345b05f8 - Implemented parseTemplateArgumentList().
aziz
parents: 138
diff changeset
2309
143
e760d7552f66 - Renamed parseArgumentList() to parseArguments().
aziz
parents: 141
diff changeset
2310 TemplateParameter[] parseTemplateParameterList()
137
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
2311 {
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
2312 require(T.LParen);
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
2313 if (token.type == T.RParen)
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
2314 return null;
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
2315
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
2316 TemplateParameter[] tparams;
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
2317 while (1)
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
2318 {
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
2319 TP tp;
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
2320 string ident;
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
2321 Type valueType;
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
2322 Type specType, defType;
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
2323 Expression specValue, defValue;
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
2324
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
2325 switch (token.type)
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
2326 {
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
2327 case T.Alias:
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
2328 // TemplateAliasParameter:
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
2329 // alias Identifier
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
2330 tp = TP.Alias;
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
2331 nT(); // Skip alias keyword.
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
2332 ident = requireIdentifier();
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
2333 // : SpecializationType
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
2334 if (token.type == T.Colon)
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
2335 {
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
2336 nT();
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
2337 specType = parseType();
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
2338 }
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
2339 // = DefaultType
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
2340 if (token.type == T.Assign)
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
2341 {
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
2342 nT();
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
2343 defType = parseType();
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
2344 }
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
2345 break;
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
2346 case T.Identifier:
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
2347 ident = token.identifier;
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
2348 Token peeked;
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
2349 lx.peek(peeked);
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
2350 switch (peeked.type)
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
2351 {
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
2352 case T.Ellipses:
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
2353 // TemplateTupleParameter:
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
2354 // Identifier ...
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
2355 tp = TP.Tuple;
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
2356 nT(); // Skip Identifier.
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
2357 nT(); // Skip Ellipses.
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
2358 // if (token.type == T.Comma)
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
2359 // error(); // TODO: issue error msg for variadic param not being last.
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
2360 break;
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
2361 case T.Comma, T.RParen, T.Colon, T.Assign:
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
2362 // TemplateTypeParameter:
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
2363 // Identifier
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
2364 tp = TP.Type;
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
2365 nT(); // Skip Identifier.
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
2366 // : SpecializationType
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
2367 if (token.type == T.Colon)
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
2368 {
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
2369 nT();
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
2370 specType = parseType();
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
2371 }
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
2372 // = DefaultType
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
2373 if (token.type == T.Assign)
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
2374 {
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
2375 nT();
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
2376 defType = parseType();
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
2377 }
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
2378 break;
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
2379 default:
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
2380 // TemplateValueParameter:
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
2381 // Declarator
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
2382 ident = null;
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
2383 goto LTemplateValueParameter;
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
2384 }
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
2385 break;
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
2386 default:
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
2387 LTemplateValueParameter:
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
2388 // TemplateValueParameter:
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
2389 // Declarator
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
2390 tp = TP.Value;
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
2391 valueType = parseDeclarator(ident);
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
2392 // : SpecializationValue
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
2393 if (token.type == T.Colon)
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
2394 {
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
2395 nT();
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
2396 specValue = parseCondExpression();
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
2397 }
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
2398 // = DefaultValue
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
2399 if (token.type == T.Assign)
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
2400 {
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
2401 nT();
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
2402 defValue = parseCondExpression();
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
2403 }
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
2404 }
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
2405
150
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument.
aziz
parents: 149
diff changeset
2406 tparams ~= new TemplateParameter(tp, valueType, ident, specType, defType, specValue, defValue);
137
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
2407
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
2408 if (token.type != T.Comma)
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
2409 break;
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
2410 nT();
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
2411 }
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
2412 require(T.RParen);
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
2413 return tparams;
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
2414 }
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
2415
124
d4c4cea6ee7f - Renamed method errorIfNot() to expected().
aziz
parents: 123
diff changeset
2416 void expected(TOK tok)
86
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions.
aziz
parents: 85
diff changeset
2417 {
87
c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token.
aziz
parents: 86
diff changeset
2418 if (token.type != tok)
c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token.
aziz
parents: 86
diff changeset
2419 error(MID.ExpectedButFound, tok, token.srcText);
86
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions.
aziz
parents: 85
diff changeset
2420 }
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions.
aziz
parents: 85
diff changeset
2421
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions.
aziz
parents: 85
diff changeset
2422 void require(TOK tok)
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions.
aziz
parents: 85
diff changeset
2423 {
87
c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token.
aziz
parents: 86
diff changeset
2424 if (token.type == tok)
86
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions.
aziz
parents: 85
diff changeset
2425 nT();
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions.
aziz
parents: 85
diff changeset
2426 else
87
c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token.
aziz
parents: 86
diff changeset
2427 error(MID.ExpectedButFound, tok, token.srcText);
86
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions.
aziz
parents: 85
diff changeset
2428 }
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions.
aziz
parents: 85
diff changeset
2429
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions.
aziz
parents: 85
diff changeset
2430 void requireNext(TOK tok)
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions.
aziz
parents: 85
diff changeset
2431 {
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions.
aziz
parents: 85
diff changeset
2432 nT();
87
c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token.
aziz
parents: 86
diff changeset
2433 if (token.type == tok)
86
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions.
aziz
parents: 85
diff changeset
2434 nT();
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions.
aziz
parents: 85
diff changeset
2435 else
87
c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token.
aziz
parents: 86
diff changeset
2436 error(MID.ExpectedButFound, tok, token.srcText);
86
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions.
aziz
parents: 85
diff changeset
2437 }
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions.
aziz
parents: 85
diff changeset
2438
115
cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier().
aziz
parents: 114
diff changeset
2439 string requireIdentifier()
cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier().
aziz
parents: 114
diff changeset
2440 {
cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier().
aziz
parents: 114
diff changeset
2441 string identifier;
cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier().
aziz
parents: 114
diff changeset
2442 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
2443 {
cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier().
aziz
parents: 114
diff changeset
2444 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
2445 nT();
cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier().
aziz
parents: 114
diff changeset
2446 }
cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier().
aziz
parents: 114
diff changeset
2447 else
cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier().
aziz
parents: 114
diff changeset
2448 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
2449 return identifier;
cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier().
aziz
parents: 114
diff changeset
2450 }
cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier().
aziz
parents: 114
diff changeset
2451
71
b3777cca323c - Added Identity and NotIdentity tokens.
aziz
parents: 70
diff changeset
2452 void error(MID id, ...)
b3777cca323c - Added Identity and NotIdentity tokens.
aziz
parents: 70
diff changeset
2453 {
94
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information.
aziz
parents: 93
diff changeset
2454 errors ~= new Information(InfoType.Parser, id, lx.loc, arguments(_arguments, _argptr));
71
b3777cca323c - Added Identity and NotIdentity tokens.
aziz
parents: 70
diff changeset
2455 }
65
6c21ae79fbb3 - Renamed function Token.span to Token.srcText.
aziz
parents: 0
diff changeset
2456 }