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

annotate trunk/src/dil/parser/Parser.d @ 673:64fec49651cf

Renamed VariableDeclaration to VariablesDeclaration. Removed TryCast and CastTo template functions. Renamed Node.iS() to Node.Is().

author	Aziz K?ksal <aziz.koeksal@gmail.com>
date	Fri, 18 Jan 2008 16:44:20 +0100
parents	f1325a4506de
children	e7811328e6c7

rev	line source
0 8ba2570de175 Initial import. aziz parents: diff changeset	1 /++
8ba2570de175 Initial import. aziz parents: diff changeset	2 Author: Aziz Köksal
249 32d354584b28 - Upgraded license notices to GPL3. aziz parents: 248 diff changeset	3 License: GPL3
0 8ba2570de175 Initial import. aziz parents: diff changeset	4 +/
578 c769bc239006 Moved Parser.d to new package 'parser'. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 576 diff changeset	5 module dil.parser.Parser;
c769bc239006 Moved Parser.d to new package 'parser'. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 576 diff changeset	6
576 0df647660e76 Moved Lexer.d to new package 'lexer'. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 555 diff changeset	7 import dil.lexer.Lexer;
588 dcfec202718d Moved dil.Types to dil.ast.Types. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 587 diff changeset	8 import dil.ast.Node;
585 05c375fb2d5c Moved dil.Declarations to dil.ast.Declarations. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 580 diff changeset	9 import dil.ast.Declarations;
587 7d0ba0c93e95 Moved dil.Statements to dil.ast.Statements. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 586 diff changeset	10 import dil.ast.Statements;
586 e25345656d10 Moved dil.Expressions to dil.ast.Expressions. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 585 diff changeset	11 import dil.ast.Expressions;
588 dcfec202718d Moved dil.Types to dil.ast.Types. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 587 diff changeset	12 import dil.ast.Types;
608 fac9e8b258fc Moved dil.ast.Parameter to dil.ast.Parameters. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 606 diff changeset	13 import dil.ast.Parameters;
601 9f96fd51cb41 Moved dil.IdTable to dil.lexer.IdTable. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 596 diff changeset	14 import dil.lexer.IdTable;
596 39fac5531b85 Moved dil.Token to dil.lexer.Token. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 588 diff changeset	15 import dil.Messages;
39fac5531b85 Moved dil.Token to dil.lexer.Token. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 588 diff changeset	16 import dil.Information;
489 a7291d3ee9d7 Refactored classes that inherit from Node. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 488 diff changeset	17 import dil.Enums;
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	18 import dil.CompilerInfo;
391 33b566df6af4 Migrated project to Tango. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 379 diff changeset	19 import common;
65 6c21ae79fbb3 - Renamed function Token.span to Token.srcText. aziz parents: 0 diff changeset	20
492 9c208925a3d4 Added module ImportParser and new stuff from DMD2.008. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 491 diff changeset	21 /++
631 2feb88f5c867 Added dil.parser.ExpressionParser and dil.parser.Factory. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 619 diff changeset	22 The Parser produces a full parse tree by analyzing
492 9c208925a3d4 Added module ImportParser and new stuff from DMD2.008. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 491 diff changeset	23 the tokens of the provided source code.
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 491 diff changeset	24 +/
65 6c21ae79fbb3 - Renamed function Token.span to Token.srcText. aziz parents: 0 diff changeset	25 class Parser
6c21ae79fbb3 - Renamed function Token.span to Token.srcText. aziz parents: 0 diff changeset	26 {
619 933cd8d24467 Renamed Parser.lx to Parser.lexer. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 618 diff changeset	27 Lexer lexer;
318 a1c9d93a66e3 - Added member prevToken to Parser. aziz parents: 314 diff changeset	28 Token* token; /// Current non-whitespace token.
a1c9d93a66e3 - Added member prevToken to Parser. aziz parents: 314 diff changeset	29 Token* prevToken; /// Previous non-whitespace token.
71 b3777cca323c - Added Identity and NotIdentity tokens. aziz parents: 70 diff changeset	30
532 50e64bab9c7a Renamed InformationManager to InfoManager. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 531 diff changeset	31 InfoManager infoMan;
514 6ddff941862a Added new error classes. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 511 diff changeset	32 ParserError[] errors;
71 b3777cca323c - Added Identity and NotIdentity tokens. aziz parents: 70 diff changeset	33
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	34 ImportDeclaration[] imports; /// ImportDeclarations in the source text.
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	35
619 933cd8d24467 Renamed Parser.lx to Parser.lexer. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 618 diff changeset	36 // Attributes are evaluated in the parsing phase.
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	37 LinkageType linkageType;
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	38 Protection protection;
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	39 StorageClass storageClass;
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	40 uint alignSize = DEFAULT_ALIGN_SIZE;
364 1059295c2727 - Every command module has an execute method now. aziz parents: 359 diff changeset	41
502 4e14cd1b24da Refactored code and added modules related to tabulated Identifiers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 501 diff changeset	42 private alias TOK T;
511 aa73f669c298 Renamed class Type to TypeNode. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 509 diff changeset	43 private alias TypeNode Type;
aa73f669c298 Renamed class Type to TypeNode. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 509 diff changeset	44
aa73f669c298 Renamed class Type to TypeNode. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 509 diff changeset	45 /++
aa73f669c298 Renamed class Type to TypeNode. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 509 diff changeset	46 Construct a Parser object.
aa73f669c298 Renamed class Type to TypeNode. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 509 diff changeset	47 Params:
aa73f669c298 Renamed class Type to TypeNode. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 509 diff changeset	48 text = the UTF-8 source code.
aa73f669c298 Renamed class Type to TypeNode. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 509 diff changeset	49 filePath = the path to the source code; used for error messages.
aa73f669c298 Renamed class Type to TypeNode. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 509 diff changeset	50 +/
532 50e64bab9c7a Renamed InformationManager to InfoManager. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 531 diff changeset	51 this(char[] srcText, string filePath, InfoManager infoMan = null)
71 b3777cca323c - Added Identity and NotIdentity tokens. aziz parents: 70 diff changeset	52 {
520 f203c5248d0b Added 'compile' command. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 519 diff changeset	53 this.infoMan = infoMan;
619 933cd8d24467 Renamed Parser.lx to Parser.lexer. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 618 diff changeset	54 lexer = new Lexer(srcText, filePath, infoMan);
87 c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	55 }
c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	56
492 9c208925a3d4 Added module ImportParser and new stuff from DMD2.008. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 491 diff changeset	57 protected void init()
206 f9f5c0949a06 - Added method start(). aziz parents: 205 diff changeset	58 {
f9f5c0949a06 - Added method start(). aziz parents: 205 diff changeset	59 nT();
318 a1c9d93a66e3 - Added member prevToken to Parser. aziz parents: 314 diff changeset	60 prevToken = token;
206 f9f5c0949a06 - Added method start(). aziz parents: 205 diff changeset	61 }
f9f5c0949a06 - Added method start(). aziz parents: 205 diff changeset	62
87 c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	63 void nT()
c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	64 {
318 a1c9d93a66e3 - Added member prevToken to Parser. aziz parents: 314 diff changeset	65 prevToken = token;
132 c97a3f683d13 - Skipping comments in nT(). aziz parents: 131 diff changeset	66 do
c97a3f683d13 - Skipping comments in nT(). aziz parents: 131 diff changeset	67 {
619 933cd8d24467 Renamed Parser.lx to Parser.lexer. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 618 diff changeset	68 lexer.nextToken();
933cd8d24467 Renamed Parser.lx to Parser.lexer. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 618 diff changeset	69 token = lexer.token;
314 ebd21bbf296e - Added Whitespace, Sheband and Hashline to enum TOK. TOK.Whitespace is a flag and tokens that are considered whitespace are flagged as such. aziz parents: 313 diff changeset	70 } while (token.isWhitespace) // Skip whitespace
71 b3777cca323c - Added Identity and NotIdentity tokens. aziz parents: 70 diff changeset	71 }
484 265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	72
265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	73 /++
265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	74 Start the parser and return the parsed Declarations.
265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	75 +/
265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	76 Declarations start()
102 6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	77 {
484 265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	78 init();
265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	79 auto begin = token;
265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	80 auto decls = new Declarations;
265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	81 if (token.type == T.Module)
265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	82 decls ~= parseModuleDeclaration();
489 a7291d3ee9d7 Refactored classes that inherit from Node. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 488 diff changeset	83 decls.addOptChildren(parseDeclarationDefinitions());
484 265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	84 set(decls, begin);
265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	85 return decls;
102 6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	86 }
484 265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	87
265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	88 /++
265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	89 Start the parser and return the parsed Expression.
265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	90 +/
265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	91 Expression start2()
265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	92 {
265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	93 init();
265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	94 return parseExpression();
265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	95 }
265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	96
423 6057113f9a44 Refactored Parser.try_(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 422 diff changeset	97 uint trying;
6057113f9a44 Refactored Parser.try_(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 422 diff changeset	98 uint errorCount;
6057113f9a44 Refactored Parser.try_(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 422 diff changeset	99
6057113f9a44 Refactored Parser.try_(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 422 diff changeset	100 /++
6057113f9a44 Refactored Parser.try_(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 422 diff changeset	101 This method executes the delegate parseMethod and when an error occurred
6057113f9a44 Refactored Parser.try_(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 422 diff changeset	102 the state of the lexer and parser are restored.
6057113f9a44 Refactored Parser.try_(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 422 diff changeset	103 +/
6057113f9a44 Refactored Parser.try_(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 422 diff changeset	104 ReturnType try_(ReturnType)(ReturnType delegate() parseMethod, out bool success)
103 511a1aa25896 - Added reportErrors member to Lexer. Moved peek() down and rewrote it a bit making use of reportErrors. error() uses reportErrors too. aziz parents: 102 diff changeset	105 {
423 6057113f9a44 Refactored Parser.try_(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 422 diff changeset	106 auto oldToken = this.token;
6057113f9a44 Refactored Parser.try_(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 422 diff changeset	107 auto oldPrevToken = this.prevToken;
6057113f9a44 Refactored Parser.try_(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 422 diff changeset	108 auto oldCount = this.errorCount;
485 ea8c7459f1c4 Changed a lot of things in the Lexer. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 484 diff changeset	109
ea8c7459f1c4 Changed a lot of things in the Lexer. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 484 diff changeset	110 ++trying;
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	111 auto result = parseMethod();
485 ea8c7459f1c4 Changed a lot of things in the Lexer. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 484 diff changeset	112 --trying;
423 6057113f9a44 Refactored Parser.try_(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 422 diff changeset	113 // Check if an error occurred.
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	114 if (errorCount != oldCount)
103 511a1aa25896 - Added reportErrors member to Lexer. Moved peek() down and rewrote it a bit making use of reportErrors. error() uses reportErrors too. aziz parents: 102 diff changeset	115 {
423 6057113f9a44 Refactored Parser.try_(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 422 diff changeset	116 // Restore members.
6057113f9a44 Refactored Parser.try_(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 422 diff changeset	117 token = oldToken;
6057113f9a44 Refactored Parser.try_(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 422 diff changeset	118 prevToken = oldPrevToken;
619 933cd8d24467 Renamed Parser.lx to Parser.lexer. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 618 diff changeset	119 lexer.token = oldToken;
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	120 errorCount = oldCount;
214 45fc474c1678 - Changed 'failed' parameter of try_() to 'success'. aziz parents: 213 diff changeset	121 success = false;
103 511a1aa25896 - Added reportErrors member to Lexer. Moved peek() down and rewrote it a bit making use of reportErrors. error() uses reportErrors too. aziz parents: 102 diff changeset	122 }
214 45fc474c1678 - Changed 'failed' parameter of try_() to 'success'. aziz parents: 213 diff changeset	123 else
45fc474c1678 - Changed 'failed' parameter of try_() to 'success'. aziz parents: 213 diff changeset	124 success = true;
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	125 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	126 }
105 df34ec47fb81 - Added getState() method and State struct to Lexer. aziz parents: 104 diff changeset	127
484 265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	128 /++
265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	129 Sets the begin and end tokens of an AST node.
265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	130 +/
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	131 Class set(Class)(Class node, Token* begin)
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	132 {
318 a1c9d93a66e3 - Added member prevToken to Parser. aziz parents: 314 diff changeset	133 node.setTokens(begin, this.prevToken);
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	134 return node;
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	135 }
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	136
484 265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	137 /++
485 ea8c7459f1c4 Changed a lot of things in the Lexer. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 484 diff changeset	138 Returns true if set() has been called on a node.
484 265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	139 +/
265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	140 bool isNodeSet(Node node)
265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	141 {
265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	142 return node.begin !is null && node.end !is null;
265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	143 }
265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	144
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	145 TOK peekNext()
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	146 {
239 7911f6a92e6e - Added 'new' and 'delete' declarations to Token and uncommented next and prev members. Added HEAD to TOK. aziz parents: 238 diff changeset	147 Token* next = token;
296 3a2afc425ceb - Fix in peekNext(): need to skip comments. aziz parents: 295 diff changeset	148 do
619 933cd8d24467 Renamed Parser.lx to Parser.lexer. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 618 diff changeset	149 lexer.peek(next);
314 ebd21bbf296e - Added Whitespace, Sheband and Hashline to enum TOK. TOK.Whitespace is a flag and tokens that are considered whitespace are flagged as such. aziz parents: 313 diff changeset	150 while (next.isWhitespace) // Skip whitespace
434 cac9c8d637ad Fix: members related to error info weren't updated correctly. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 429 diff changeset	151 return next.type;
cac9c8d637ad Fix: members related to error info weren't updated correctly. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 429 diff changeset	152 }
cac9c8d637ad Fix: members related to error info weren't updated correctly. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 429 diff changeset	153
cac9c8d637ad Fix: members related to error info weren't updated correctly. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 429 diff changeset	154 TOK peekAfter(ref Token* next)
cac9c8d637ad Fix: members related to error info weren't updated correctly. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 429 diff changeset	155 {
cac9c8d637ad Fix: members related to error info weren't updated correctly. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 429 diff changeset	156 assert(next !is null);
cac9c8d637ad Fix: members related to error info weren't updated correctly. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 429 diff changeset	157 do
619 933cd8d24467 Renamed Parser.lx to Parser.lexer. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 618 diff changeset	158 lexer.peek(next);
434 cac9c8d637ad Fix: members related to error info weren't updated correctly. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 429 diff changeset	159 while (next.isWhitespace) // Skip whitespace
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	160 return next.type;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	161 }
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	162
531 315aeb3f7a9b Added method skipped() to dil.Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 530 diff changeset	163 /// Skips the current token if its type matches tok and returns true.
315aeb3f7a9b Added method skipped() to dil.Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 530 diff changeset	164 bool skipped()(TOK tok) // Templatized, so it's inlined.
315aeb3f7a9b Added method skipped() to dil.Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 530 diff changeset	165 {
315aeb3f7a9b Added method skipped() to dil.Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 530 diff changeset	166 return token.type == tok ? (nT(), true) : false;
315aeb3f7a9b Added method skipped() to dil.Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 530 diff changeset	167 }
315aeb3f7a9b Added method skipped() to dil.Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 530 diff changeset	168
102 6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	169 /++++++++++++++++++++++++++++++
6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	170 + Declaration parsing methods +
6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	171 ++++++++++++++++++++++++++++++/
6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	172
368 2adf808343d6 - Renamed method start() to init() in Parser. aziz parents: 367 diff changeset	173 Declaration parseModuleDeclaration()
2adf808343d6 - Renamed method start() to init() in Parser. aziz parents: 367 diff changeset	174 {
637 fe66cecb6ec9 Reporting error if module declaration is not first. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 634 diff changeset	175 assert(token.type == T.Module);
368 2adf808343d6 - Renamed method start() to init() in Parser. aziz parents: 367 diff changeset	176 auto begin = token;
2adf808343d6 - Renamed method start() to init() in Parser. aziz parents: 367 diff changeset	177 ModuleFQN moduleFQN;
2adf808343d6 - Renamed method start() to init() in Parser. aziz parents: 367 diff changeset	178 do
2adf808343d6 - Renamed method start() to init() in Parser. aziz parents: 367 diff changeset	179 {
2adf808343d6 - Renamed method start() to init() in Parser. aziz parents: 367 diff changeset	180 nT();
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	181 moduleFQN ~= requireIdentifier(MSG.ExpectedModuleIdentifier);
368 2adf808343d6 - Renamed method start() to init() in Parser. aziz parents: 367 diff changeset	182 } while (token.type == T.Dot)
2adf808343d6 - Renamed method start() to init() in Parser. aziz parents: 367 diff changeset	183 require(T.Semicolon);
2adf808343d6 - Renamed method start() to init() in Parser. aziz parents: 367 diff changeset	184 return set(new ModuleDeclaration(moduleFQN), begin);
2adf808343d6 - Renamed method start() to init() in Parser. aziz parents: 367 diff changeset	185 }
2adf808343d6 - Renamed method start() to init() in Parser. aziz parents: 367 diff changeset	186
485 ea8c7459f1c4 Changed a lot of things in the Lexer. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 484 diff changeset	187 /++
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	188 Parse DeclarationDefinitions until the end of file is hit.
485 ea8c7459f1c4 Changed a lot of things in the Lexer. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 484 diff changeset	189 DeclDefs:
ea8c7459f1c4 Changed a lot of things in the Lexer. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 484 diff changeset	190 DeclDef
ea8c7459f1c4 Changed a lot of things in the Lexer. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 484 diff changeset	191 DeclDefs
ea8c7459f1c4 Changed a lot of things in the Lexer. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 484 diff changeset	192 +/
486 bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	193 Declaration[] parseDeclarationDefinitions()
102 6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	194 {
486 bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	195 Declaration[] decls;
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	196 while (token.type != T.EOF)
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	197 decls ~= parseDeclarationDefinition();
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	198 return decls;
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	199 }
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	200
485 ea8c7459f1c4 Changed a lot of things in the Lexer. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 484 diff changeset	201 /++
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	202 Parse the body of a template, class, interface, struct or union.
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	203 DeclDefsBlock:
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	204 { }
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	205 { DeclDefs }
485 ea8c7459f1c4 Changed a lot of things in the Lexer. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 484 diff changeset	206 +/
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	207 Declarations parseDeclarationDefinitionsBody()
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	208 {
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	209 // Save attributes.
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	210 auto linkageType = this.linkageType;
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	211 auto protection = this.protection;
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	212 auto storageClass = this.storageClass;
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	213 // Clear attributes.
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	214 this.linkageType = LinkageType.None;
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	215 this.protection = Protection.None;
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	216 this.storageClass = StorageClass.None;
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	217
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	218 // Parse body.
484 265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	219 auto begin = token;
305 df237b3b5f09 - Added class Declarations. aziz parents: 304 diff changeset	220 auto decls = new Declarations;
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	221 require(T.LBrace);
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	222 while (token.type != T.RBrace && token.type != T.EOF)
161 82c5cfc7d6d3 - Started implementation of parsing statements. aziz parents: 160 diff changeset	223 decls ~= parseDeclarationDefinition();
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	224 require(T.RBrace);
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	225 set(decls, begin);
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	226
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	227 // Restore original values.
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	228 this.linkageType = linkageType;
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	229 this.protection = protection;
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	230 this.storageClass = storageClass;
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	231
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	232 return decls;
102 6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	233 }
6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	234
110 2fb631daaaae - Renamed methods. aziz parents: 109 diff changeset	235 Declaration parseDeclarationDefinition()
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	236 out(decl)
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	237 { assert(isNodeSet(decl)); }
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	238 body
102 6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	239 {
262 0f22269e76ff - Changed some string types to Token. aziz* parents: 261 diff changeset	240 auto begin = token;
103 511a1aa25896 - Added reportErrors member to Lexer. Moved peek() down and rewrote it a bit making use of reportErrors. error() uses reportErrors too. aziz parents: 102 diff changeset	241 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	242 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	243 {
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	244 case T.Align,
103 511a1aa25896 - Added reportErrors member to Lexer. Moved peek() down and rewrote it a bit making use of reportErrors. error() uses reportErrors too. aziz parents: 102 diff changeset	245 T.Pragma,
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	246 // Protection attributes
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	247 T.Export,
103 511a1aa25896 - Added reportErrors member to Lexer. Moved peek() down and rewrote it a bit making use of reportErrors. error() uses reportErrors too. aziz parents: 102 diff changeset	248 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	249 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	250 T.Protected,
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	251 T.Public:
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	252 decl = parseAttributeSpecifier();
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	253 break;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	254 // Storage classes
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	255 case T.Extern,
203 4f949a3a394b - synchronized is parsed as an Attribute in parseDeclarationDefinition() now. aziz parents: 202 diff changeset	256 T.Deprecated,
4f949a3a394b - synchronized is parsed as an Attribute in parseDeclarationDefinition() now. aziz parents: 202 diff changeset	257 T.Override,
4f949a3a394b - synchronized is parsed as an Attribute in parseDeclarationDefinition() now. aziz parents: 202 diff changeset	258 T.Abstract,
4f949a3a394b - synchronized is parsed as an Attribute in parseDeclarationDefinition() now. aziz parents: 202 diff changeset	259 T.Synchronized,
103 511a1aa25896 - Added reportErrors member to Lexer. Moved peek() down and rewrote it a bit making use of reportErrors. error() uses reportErrors too. aziz parents: 102 diff changeset	260 //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	261 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	262 T.Const,
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	263 //T.Invariant, // D 2.0
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	264 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	265 T.Scope:
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	266 case_StaticAttribute:
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	267 case_InvariantAttribute: // D 2.0
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	268 return parseStorageAttribute();
191 3ce110cefbc5 - Added code for parsing AliasDeclaration and TypedefDeclaration. aziz parents: 190 diff changeset	269 case T.Alias:
3ce110cefbc5 - Added code for parsing AliasDeclaration and TypedefDeclaration. aziz parents: 190 diff changeset	270 nT();
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	271 decl = new AliasDeclaration(parseVariableOrFunction());
191 3ce110cefbc5 - Added code for parsing AliasDeclaration and TypedefDeclaration. aziz parents: 190 diff changeset	272 break;
3ce110cefbc5 - Added code for parsing AliasDeclaration and TypedefDeclaration. aziz parents: 190 diff changeset	273 case T.Typedef:
3ce110cefbc5 - Added code for parsing AliasDeclaration and TypedefDeclaration. aziz parents: 190 diff changeset	274 nT();
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	275 decl = new TypedefDeclaration(parseVariableOrFunction());
191 3ce110cefbc5 - Added code for parsing AliasDeclaration and TypedefDeclaration. aziz parents: 190 diff changeset	276 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	277 case T.Static:
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	278 switch (peekNext())
125 240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	279 {
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	280 case T.Import:
429 052cbacb1642 Fix: removed infinite loop when parsing static imports. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 424 diff changeset	281 goto case_Import;
125 240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	282 case T.This:
119 363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	283 decl = parseStaticConstructorDeclaration();
125 240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	284 break;
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	285 case T.Tilde:
119 363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	286 decl = parseStaticDestructorDeclaration();
125 240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	287 break;
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	288 case T.If:
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	289 decl = parseStaticIfDeclaration();
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	290 break;
127 cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration. aziz parents: 126 diff changeset	291 case T.Assert:
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration. aziz parents: 126 diff changeset	292 decl = parseStaticAssertDeclaration();
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration. aziz parents: 126 diff changeset	293 break;
125 240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	294 default:
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	295 goto case_StaticAttribute;
125 240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	296 }
228 a4c5ee9527b7 - Replaced assert(0); with break; in case T.Static. Renamed local t to next. aziz parents: 227 diff changeset	297 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	298 case T.Import:
429 052cbacb1642 Fix: removed infinite loop when parsing static imports. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 424 diff changeset	299 case_Import:
107 722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	300 decl = parseImportDeclaration();
673 64fec49651cf Renamed VariableDeclaration to VariablesDeclaration. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 671 diff changeset	301 imports ~= decl.to!(ImportDeclaration);
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	302 // Handle specially. StorageClass mustn't be set.
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	303 decl.setProtection(this.protection);
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	304 return set(decl, begin);
107 722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	305 case T.Enum:
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	306 decl = parseEnumDeclaration();
109 d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	307 break;
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	308 case T.Class:
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	309 decl = parseClassDeclaration();
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	310 break;
112 004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	311 case T.Interface:
004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	312 decl = parseInterfaceDeclaration();
004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	313 break;
113 20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	314 case T.Struct, T.Union:
638 7131c07997f9 Renamed parseAggregateDeclaration() to parseStructOrUnionDeclaration(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 637 diff changeset	315 decl = parseStructOrUnionDeclaration();
113 20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	316 break;
117 79857de26e86 - Moved class Parameter to module Types. Added struct Parameters. aziz parents: 116 diff changeset	317 case T.This:
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters. aziz parents: 116 diff changeset	318 decl = parseConstructorDeclaration();
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters. aziz parents: 116 diff changeset	319 break;
118 379f33cbd521 - Added parseDestructorDeclaration() and DestructorDeclaration class. aziz parents: 117 diff changeset	320 case T.Tilde:
379f33cbd521 - Added parseDestructorDeclaration() and DestructorDeclaration class. aziz parents: 117 diff changeset	321 decl = parseDestructorDeclaration();
379f33cbd521 - Added parseDestructorDeclaration() and DestructorDeclaration class. aziz parents: 117 diff changeset	322 break;
120 e5329dac0405 - Added parseInvariantDeclaration(). aziz parents: 119 diff changeset	323 case T.Invariant:
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	324 version(D2)
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	325 {
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	326 auto next = token;
434 cac9c8d637ad Fix: members related to error info weren't updated correctly. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 429 diff changeset	327 if (peekAfter(next) == T.LParen)
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	328 {
434 cac9c8d637ad Fix: members related to error info weren't updated correctly. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 429 diff changeset	329 if (peekAfter(next) != T.RParen)
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	330 goto case_Declaration;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	331 }
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	332 else
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	333 goto case_InvariantAttribute;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	334 }
120 e5329dac0405 - Added parseInvariantDeclaration(). aziz parents: 119 diff changeset	335 decl = parseInvariantDeclaration();
e5329dac0405 - Added parseInvariantDeclaration(). aziz parents: 119 diff changeset	336 break;
121 030933c6b5f0 - Added parseUnittestDeclaration(). aziz parents: 120 diff changeset	337 case T.Unittest:
030933c6b5f0 - Added parseUnittestDeclaration(). aziz parents: 120 diff changeset	338 decl = parseUnittestDeclaration();
030933c6b5f0 - Added parseUnittestDeclaration(). aziz parents: 120 diff changeset	339 break;
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	340 case T.Debug:
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	341 decl = parseDebugDeclaration();
140 64d7186b087c - Implemented parseTemplateParameters(). aziz parents: 139 diff changeset	342 break;
146 8180eb84e69c - Started implementation of parseAttributeSpecifier(). aziz parents: 145 diff changeset	343 case T.Version:
8180eb84e69c - Started implementation of parseAttributeSpecifier(). aziz parents: 145 diff changeset	344 decl = parseVersionDeclaration();
8180eb84e69c - Started implementation of parseAttributeSpecifier(). aziz parents: 145 diff changeset	345 break;
140 64d7186b087c - Implemented parseTemplateParameters(). aziz parents: 139 diff changeset	346 case T.Template:
64d7186b087c - Implemented parseTemplateParameters(). aziz parents: 139 diff changeset	347 decl = parseTemplateDeclaration();
64d7186b087c - Implemented parseTemplateParameters(). aziz parents: 139 diff changeset	348 break;
141 7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration(). aziz parents: 140 diff changeset	349 case T.New:
7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration(). aziz parents: 140 diff changeset	350 decl = parseNewDeclaration();
7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration(). aziz parents: 140 diff changeset	351 break;
7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration(). aziz parents: 140 diff changeset	352 case T.Delete:
7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration(). aziz parents: 140 diff changeset	353 decl = parseDeleteDeclaration();
7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration(). aziz parents: 140 diff changeset	354 break;
146 8180eb84e69c - Started implementation of parseAttributeSpecifier(). aziz parents: 145 diff changeset	355 case T.Mixin:
256 8f27920ae17a - Made parseMixinDeclaration() a template. aziz parents: 255 diff changeset	356 decl = parseMixin!(MixinDeclaration)();
146 8180eb84e69c - Started implementation of parseAttributeSpecifier(). aziz parents: 145 diff changeset	357 break;
129 a9244d409652 - Added class EmptyDeclaration. aziz parents: 128 diff changeset	358 case T.Semicolon:
a9244d409652 - Added class EmptyDeclaration. aziz parents: 128 diff changeset	359 nT();
a9244d409652 - Added class EmptyDeclaration. aziz parents: 128 diff changeset	360 decl = new EmptyDeclaration();
a9244d409652 - Added class EmptyDeclaration. aziz parents: 128 diff changeset	361 break;
192 5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	362 // Declaration
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	363 case T.Identifier, T.Dot, T.Typeof:
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	364 case_Declaration:
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	365 return parseVariableOrFunction(this.storageClass, this.protection, this.linkageType);
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	366 default:
508 943ecc9c133a Added isIntegralType() to Token and refactored code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 507 diff changeset	367 if (token.isIntegralType)
943ecc9c133a Added isIntegralType() to Token and refactored code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 507 diff changeset	368 goto case_Declaration;
637 fe66cecb6ec9 Reporting error if module declaration is not first. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 634 diff changeset	369 else if (token.type == T.Module)
fe66cecb6ec9 Reporting error if module declaration is not first. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 634 diff changeset	370 {
fe66cecb6ec9 Reporting error if module declaration is not first. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 634 diff changeset	371 decl = parseModuleDeclaration();
fe66cecb6ec9 Reporting error if module declaration is not first. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 634 diff changeset	372 error(begin, MSG.ModuleDeclarationNotFirst);
fe66cecb6ec9 Reporting error if module declaration is not first. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 634 diff changeset	373 return decl;
fe66cecb6ec9 Reporting error if module declaration is not first. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 634 diff changeset	374 }
508 943ecc9c133a Added isIntegralType() to Token and refactored code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 507 diff changeset	375
496 5a607597dc22 Improved error recovery in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 495 diff changeset	376 decl = new IllegalDeclaration();
5a607597dc22 Improved error recovery in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 495 diff changeset	377 // Skip to next valid token.
5a607597dc22 Improved error recovery in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 495 diff changeset	378 do
5a607597dc22 Improved error recovery in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 495 diff changeset	379 nT();
5a607597dc22 Improved error recovery in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 495 diff changeset	380 while (!token.isDeclDefStart &&
5a607597dc22 Improved error recovery in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 495 diff changeset	381 token.type != T.RBrace &&
5a607597dc22 Improved error recovery in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 495 diff changeset	382 token.type != T.EOF)
5a607597dc22 Improved error recovery in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 495 diff changeset	383 auto text = Token.textSpan(begin, this.prevToken);
616 506ce60760d8 Fixed some error messages. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 608 diff changeset	384 error(begin, MSG.IllegalDeclaration, text);
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	385 }
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	386 decl.setProtection(this.protection);
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	387 decl.setStorageClass(this.storageClass);
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	388 assert(!isNodeSet(decl));
262 0f22269e76ff - Changed some string types to Token. aziz* parents: 261 diff changeset	389 set(decl, begin);
129 a9244d409652 - Added class EmptyDeclaration. aziz parents: 128 diff changeset	390 return decl;
102 6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	391 }
6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	392
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	393 /++
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	394 DeclarationsBlock:
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	395 : DeclDefs
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	396 { }
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	397 { DeclDefs }
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	398 DeclDef
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	399 +/
404 fe46b5ea7a18 Added method parseDeclarationsBlockNoColon(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 400 diff changeset	400 Declaration parseDeclarationsBlock(bool noColon = false)
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	401 {
305 df237b3b5f09 - Added class Declarations. aziz parents: 304 diff changeset	402 Declaration d;
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	403 switch (token.type)
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	404 {
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	405 case T.LBrace:
528 d0ac6faeaf66 Fixed something in dil.Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 524 diff changeset	406 auto begin = token;
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	407 nT();
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	408 auto decls = new Declarations;
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	409 while (token.type != T.RBrace && token.type != T.EOF)
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	410 decls ~= parseDeclarationDefinition();
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	411 require(T.RBrace);
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	412 d = set(decls, begin);
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	413 break;
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	414 case T.Colon:
404 fe46b5ea7a18 Added method parseDeclarationsBlockNoColon(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 400 diff changeset	415 if (noColon == true)
fe46b5ea7a18 Added method parseDeclarationsBlockNoColon(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 400 diff changeset	416 goto default;
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	417 nT();
484 265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	418 auto begin = token;
305 df237b3b5f09 - Added class Declarations. aziz parents: 304 diff changeset	419 auto decls = new Declarations;
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	420 while (token.type != T.RBrace && token.type != T.EOF)
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	421 decls ~= parseDeclarationDefinition();
484 265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	422 d = set(decls, begin);
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	423 break;
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	424 default:
305 df237b3b5f09 - Added class Declarations. aziz parents: 304 diff changeset	425 d = parseDeclarationDefinition();
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	426 }
484 265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	427 assert(isNodeSet(d));
305 df237b3b5f09 - Added class Declarations. aziz parents: 304 diff changeset	428 return d;
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	429 }
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	430
404 fe46b5ea7a18 Added method parseDeclarationsBlockNoColon(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 400 diff changeset	431 Declaration parseDeclarationsBlockNoColon()
fe46b5ea7a18 Added method parseDeclarationsBlockNoColon(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 400 diff changeset	432 {
fe46b5ea7a18 Added method parseDeclarationsBlockNoColon(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 400 diff changeset	433 return parseDeclarationsBlock(true);
fe46b5ea7a18 Added method parseDeclarationsBlockNoColon(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 400 diff changeset	434 }
fe46b5ea7a18 Added method parseDeclarationsBlockNoColon(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 400 diff changeset	435
483 180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	436 /++
180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	437 Parses either a VariableDeclaration or a FunctionDeclaration.
180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	438 Params:
555 d9e328c3bab9 Fixed infinite loop in dil.Parser.parseMixin(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 539 diff changeset	439 stc = previously parsed storage classes
d9e328c3bab9 Fixed infinite loop in dil.Parser.parseMixin(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 539 diff changeset	440 protection = previously parsed protection attribute
d9e328c3bab9 Fixed infinite loop in dil.Parser.parseMixin(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 539 diff changeset	441 linkType = previously parsed linkage type
d9e328c3bab9 Fixed infinite loop in dil.Parser.parseMixin(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 539 diff changeset	442 testAutoDeclaration = whether to check for an AutoDeclaration
483 180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	443 optionalParameterList = a hint for how to parse C-style function pointers
180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	444 +/
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	445 Declaration parseVariableOrFunction(StorageClass stc = StorageClass.None,
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	446 Protection protection = Protection.None,
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	447 LinkageType linkType = LinkageType.None,
501 949a53332c66 Fixed parsing of AutoDeclarations. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 496 diff changeset	448 bool testAutoDeclaration = false,
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	449 bool optionalParameterList = true)
192 5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	450 {
483 180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	451 auto begin = token;
202 8aecf8925c5f - Added code for parsing AutoDeclaration in parseDeclaration(). aziz parents: 201 diff changeset	452 Type type;
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	453 Identifier* ident;
192 5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	454
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	455 // Check for AutoDeclaration: StorageClasses Identifier =
501 949a53332c66 Fixed parsing of AutoDeclarations. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 496 diff changeset	456 if (testAutoDeclaration &&
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	457 token.type == T.Identifier &&
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	458 peekNext() == T.Assign)
192 5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	459 {
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	460 ident = token.ident;
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	461 nT();
202 8aecf8925c5f - Added code for parsing AutoDeclaration in parseDeclaration(). aziz parents: 201 diff changeset	462 }
8aecf8925c5f - Added code for parsing AutoDeclaration in parseDeclaration(). aziz parents: 201 diff changeset	463 else
8aecf8925c5f - Added code for parsing AutoDeclaration in parseDeclaration(). aziz parents: 201 diff changeset	464 {
530 4b783fa06277 Unindented if-block in parseVariableOrFunction(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 529 diff changeset	465 type = parseType(); // VariableType or ReturnType
202 8aecf8925c5f - Added code for parsing AutoDeclaration in parseDeclaration(). aziz parents: 201 diff changeset	466 if (token.type == T.LParen)
8aecf8925c5f - Added code for parsing AutoDeclaration in parseDeclaration(). aziz parents: 201 diff changeset	467 {
483 180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	468 // C-style function pointers make the grammar ambiguous.
180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	469 // We have to treat them specially at function scope.
180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	470 // Example:
180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	471 // void foo() {
180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	472 // // A pointer to a function taking an integer and returning 'some_type'.
180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	473 // some_type (*p_func)(int);
180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	474 // // In the following case precedence is given to a CallExpression.
180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	475 // something(*p); // 'something' may be a function/method or an object having opCall overloaded.
180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	476 // }
180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	477 // // A pointer to a function taking no parameters and returning 'something'.
180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	478 // something(*p);
180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	479 type = parseCFunctionPointerType(type, ident, optionalParameterList);
415 b18b0cd8f8cd Fixed parsing C function pointers in declarations. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 414 diff changeset	480 }
530 4b783fa06277 Unindented if-block in parseVariableOrFunction(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 529 diff changeset	481 else if (peekNext() == T.LParen)
4b783fa06277 Unindented if-block in parseVariableOrFunction(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 529 diff changeset	482 { // Type FunctionName ( ParameterList ) FunctionBody
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	483 ident = requireIdentifier(MSG.ExpectedFunctionName);
530 4b783fa06277 Unindented if-block in parseVariableOrFunction(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 529 diff changeset	484 ident \|\| nT(); // Skip non-identifier token.
4b783fa06277 Unindented if-block in parseVariableOrFunction(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 529 diff changeset	485 assert(token.type == T.LParen);
4b783fa06277 Unindented if-block in parseVariableOrFunction(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 529 diff changeset	486 // It's a function declaration
4b783fa06277 Unindented if-block in parseVariableOrFunction(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 529 diff changeset	487 TemplateParameters tparams;
4b783fa06277 Unindented if-block in parseVariableOrFunction(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 529 diff changeset	488 if (tokenAfterParenIs(T.LParen))
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	489 {
530 4b783fa06277 Unindented if-block in parseVariableOrFunction(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 529 diff changeset	490 // ( TemplateParameterList ) ( ParameterList )
4b783fa06277 Unindented if-block in parseVariableOrFunction(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 529 diff changeset	491 tparams = parseTemplateParameterList();
4b783fa06277 Unindented if-block in parseVariableOrFunction(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 529 diff changeset	492 }
4b783fa06277 Unindented if-block in parseVariableOrFunction(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 529 diff changeset	493
4b783fa06277 Unindented if-block in parseVariableOrFunction(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 529 diff changeset	494 auto params = parseParameterList();
4b783fa06277 Unindented if-block in parseVariableOrFunction(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 529 diff changeset	495 version(D2)
4b783fa06277 Unindented if-block in parseVariableOrFunction(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 529 diff changeset	496 {
4b783fa06277 Unindented if-block in parseVariableOrFunction(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 529 diff changeset	497 switch (token.type)
492 9c208925a3d4 Added module ImportParser and new stuff from DMD2.008. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 491 diff changeset	498 {
530 4b783fa06277 Unindented if-block in parseVariableOrFunction(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 529 diff changeset	499 case T.Const:
4b783fa06277 Unindented if-block in parseVariableOrFunction(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 529 diff changeset	500 stc \|= StorageClass.Const;
4b783fa06277 Unindented if-block in parseVariableOrFunction(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 529 diff changeset	501 nT();
4b783fa06277 Unindented if-block in parseVariableOrFunction(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 529 diff changeset	502 break;
4b783fa06277 Unindented if-block in parseVariableOrFunction(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 529 diff changeset	503 case T.Invariant:
4b783fa06277 Unindented if-block in parseVariableOrFunction(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 529 diff changeset	504 stc \|= StorageClass.Invariant;
4b783fa06277 Unindented if-block in parseVariableOrFunction(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 529 diff changeset	505 nT();
4b783fa06277 Unindented if-block in parseVariableOrFunction(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 529 diff changeset	506 break;
4b783fa06277 Unindented if-block in parseVariableOrFunction(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 529 diff changeset	507 default:
492 9c208925a3d4 Added module ImportParser and new stuff from DMD2.008. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 491 diff changeset	508 }
202 8aecf8925c5f - Added code for parsing AutoDeclaration in parseDeclaration(). aziz parents: 201 diff changeset	509 }
530 4b783fa06277 Unindented if-block in parseVariableOrFunction(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 529 diff changeset	510 // ReturnType FunctionName ( ParameterList )
4b783fa06277 Unindented if-block in parseVariableOrFunction(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 529 diff changeset	511 auto funcBody = parseFunctionBody();
4b783fa06277 Unindented if-block in parseVariableOrFunction(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 529 diff changeset	512 auto d = new FunctionDeclaration(type, ident, tparams, params, funcBody);
4b783fa06277 Unindented if-block in parseVariableOrFunction(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 529 diff changeset	513 d.setStorageClass(stc);
4b783fa06277 Unindented if-block in parseVariableOrFunction(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 529 diff changeset	514 d.setLinkageType(linkType);
4b783fa06277 Unindented if-block in parseVariableOrFunction(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 529 diff changeset	515 d.setProtection(protection);
4b783fa06277 Unindented if-block in parseVariableOrFunction(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 529 diff changeset	516 return set(d, begin);
4b783fa06277 Unindented if-block in parseVariableOrFunction(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 529 diff changeset	517 }
535 bdd49ad84f5f Fixed parsing bug in parseVariableOrFunction(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 532 diff changeset	518 else
bdd49ad84f5f Fixed parsing bug in parseVariableOrFunction(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 532 diff changeset	519 {
bdd49ad84f5f Fixed parsing bug in parseVariableOrFunction(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 532 diff changeset	520 // Type VariableName DeclaratorSuffix
bdd49ad84f5f Fixed parsing bug in parseVariableOrFunction(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 532 diff changeset	521 ident = requireIdentifier(MSG.ExpectedVariableName);
bdd49ad84f5f Fixed parsing bug in parseVariableOrFunction(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 532 diff changeset	522 type = parseDeclaratorSuffix(type);
bdd49ad84f5f Fixed parsing bug in parseVariableOrFunction(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 532 diff changeset	523 }
192 5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	524 }
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	525
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	526 // It's a variable declaration.
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	527 Identifier*[] idents = [ident];
194 b3604b237292 - Implemented parsing variable declarations. aziz parents: 193 diff changeset	528 Expression[] values;
199 a95fee6e4b7e - Fix: parseDeclaration(): appending null to values when no initializer present. aziz parents: 198 diff changeset	529 goto LenterLoop; // We've already parsed an identifier. Jump to if statement and check for initializer.
194 b3604b237292 - Implemented parsing variable declarations. aziz parents: 193 diff changeset	530 while (token.type == T.Comma)
b3604b237292 - Implemented parsing variable declarations. aziz parents: 193 diff changeset	531 {
222 4f31e4671e06 - Fix: nT() wasn't called in while loop to skip T.Comma. aziz parents: 220 diff changeset	532 nT();
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	533 idents ~= requireIdentifier(MSG.ExpectedVariableName);
194 b3604b237292 - Implemented parsing variable declarations. aziz parents: 193 diff changeset	534 LenterLoop:
531 315aeb3f7a9b Added method skipped() to dil.Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 530 diff changeset	535 if (skipped(T.Assign))
315aeb3f7a9b Added method skipped() to dil.Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 530 diff changeset	536 values ~= parseInitializer();
199 a95fee6e4b7e - Fix: parseDeclaration(): appending null to values when no initializer present. aziz parents: 198 diff changeset	537 else
a95fee6e4b7e - Fix: parseDeclaration(): appending null to values when no initializer present. aziz parents: 198 diff changeset	538 values ~= null;
194 b3604b237292 - Implemented parsing variable declarations. aziz parents: 193 diff changeset	539 }
b3604b237292 - Implemented parsing variable declarations. aziz parents: 193 diff changeset	540 require(T.Semicolon);
673 64fec49651cf Renamed VariableDeclaration to VariablesDeclaration. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 671 diff changeset	541 auto d = new VariablesDeclaration(type, idents, values);
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	542 d.setStorageClass(stc);
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	543 d.setLinkageType(linkType);
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	544 d.setProtection(protection);
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	545 return set(d, begin);
194 b3604b237292 - Implemented parsing variable declarations. aziz parents: 193 diff changeset	546 }
192 5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	547
194 b3604b237292 - Implemented parsing variable declarations. aziz parents: 193 diff changeset	548 Expression parseInitializer()
b3604b237292 - Implemented parsing variable declarations. aziz parents: 193 diff changeset	549 {
198 88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	550 if (token.type == T.Void)
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	551 {
266 fea4e8b6cea5 - Added begin variables and calls to set(). aziz parents: 265 diff changeset	552 auto begin = token;
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	553 auto next = peekNext();
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	554 if (next == T.Comma \|\| next == T.Semicolon)
198 88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	555 {
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	556 nT();
266 fea4e8b6cea5 - Added begin variables and calls to set(). aziz parents: 265 diff changeset	557 return set(new VoidInitializer(), begin);
198 88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	558 }
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	559 }
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	560 return parseNonVoidInitializer();
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	561 }
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	562
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	563 Expression parseNonVoidInitializer()
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	564 {
266 fea4e8b6cea5 - Added begin variables and calls to set(). aziz parents: 265 diff changeset	565 auto begin = token;
198 88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	566 Expression init;
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	567 switch (token.type)
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	568 {
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	569 case T.LBracket:
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	570 // ArrayInitializer:
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	571 // [ ]
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	572 // [ ArrayMemberInitializations ]
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	573 Expression[] keys;
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	574 Expression[] values;
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	575
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	576 nT();
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	577 while (token.type != T.RBracket)
198 88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	578 {
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	579 auto e = parseNonVoidInitializer();
531 315aeb3f7a9b Added method skipped() to dil.Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 530 diff changeset	580 if (skipped(T.Colon))
198 88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	581 {
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	582 keys ~= e;
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	583 values ~= parseNonVoidInitializer();
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	584 }
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	585 else
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	586 {
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	587 keys ~= null;
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	588 values ~= e;
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	589 }
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	590
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	591 if (token.type != T.Comma)
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	592 break;
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	593 nT();
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	594 }
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	595 require(T.RBracket);
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	596 init = new ArrayInitializer(keys, values);
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	597 break;
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	598 case T.LBrace:
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	599 // StructInitializer:
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	600 // { }
198 88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	601 // { StructMemberInitializers }
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	602 Expression parseStructInitializer()
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	603 {
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	604 Identifier*[] idents;
198 88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	605 Expression[] values;
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	606
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	607 nT();
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	608 while (token.type != T.RBrace)
198 88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	609 {
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	610 if (token.type == T.Identifier &&
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	611 // Peek for colon to see if this is a member identifier.
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	612 peekNext() == T.Colon)
198 88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	613 {
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	614 idents ~= token.ident;
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	615 nT(), nT(); // Skip Identifier :
198 88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	616 }
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	617 else
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	618 idents ~= null;
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	619
198 88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	620 // NonVoidInitializer
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	621 values ~= parseNonVoidInitializer();
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	622
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	623 if (token.type != T.Comma)
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	624 break;
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	625 nT();
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	626 }
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	627 require(T.RBrace);
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	628 return new StructInitializer(idents, values);
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	629 }
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	630
214 45fc474c1678 - Changed 'failed' parameter of try_() to 'success'. aziz parents: 213 diff changeset	631 bool success;
423 6057113f9a44 Refactored Parser.try_(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 422 diff changeset	632 auto si = try_(&parseStructInitializer, success);
214 45fc474c1678 - Changed 'failed' parameter of try_() to 'success'. aziz parents: 213 diff changeset	633 if (success)
200 61f60112ac63 - Fix: parsing AssignExpression when parsing StructInitializer failed. aziz parents: 199 diff changeset	634 {
198 88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	635 init = si;
200 61f60112ac63 - Fix: parsing AssignExpression when parsing StructInitializer failed. aziz parents: 199 diff changeset	636 break;
61f60112ac63 - Fix: parsing AssignExpression when parsing StructInitializer failed. aziz parents: 199 diff changeset	637 }
216 984d48932bce - Added class EmptyStatement. aziz parents: 214 diff changeset	638 assert(token.type == T.LBrace);
200 61f60112ac63 - Fix: parsing AssignExpression when parsing StructInitializer failed. aziz parents: 199 diff changeset	639 //goto default;
198 88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	640 default:
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	641 init = parseAssignExpression();
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	642 }
266 fea4e8b6cea5 - Added begin variables and calls to set(). aziz parents: 265 diff changeset	643 set(init, begin);
198 88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer(). aziz parents: 197 diff changeset	644 return init;
192 5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	645 }
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	646
267 f3dfa6208ed3 - Removed parameter func from parseFunctionBody(). Creating new FunctionBody inside the method. aziz parents: 266 diff changeset	647 FunctionBody parseFunctionBody()
192 5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	648 {
268 c19b68a4e3db - FunctionBody inherits from Node now. aziz parents: 267 diff changeset	649 auto begin = token;
267 f3dfa6208ed3 - Removed parameter func from parseFunctionBody(). Creating new FunctionBody inside the method. aziz parents: 266 diff changeset	650 auto func = new FunctionBody;
192 5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	651 while (1)
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	652 {
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	653 switch (token.type)
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	654 {
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	655 case T.LBrace:
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	656 func.funcBody = parseStatements();
192 5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	657 break;
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	658 case T.Semicolon:
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	659 nT();
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	660 break;
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	661 case T.In:
342 f13d551d7c4f - Added error messages MID.InContract and MID.OutContract. aziz parents: 341 diff changeset	662 if (func.inBody)
f13d551d7c4f - Added error messages MID.InContract and MID.OutContract. aziz parents: 341 diff changeset	663 error(MID.InContract);
226 aa38e1401217 - Fixed cases T.Alias and T.Typedef. Wrong function called. aziz parents: 225 diff changeset	664 nT();
192 5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	665 func.inBody = parseStatements();
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	666 continue;
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	667 case T.Out:
342 f13d551d7c4f - Added error messages MID.InContract and MID.OutContract. aziz parents: 341 diff changeset	668 if (func.outBody)
f13d551d7c4f - Added error messages MID.InContract and MID.OutContract. aziz parents: 341 diff changeset	669 error(MID.OutContract);
192 5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	670 nT();
531 315aeb3f7a9b Added method skipped() to dil.Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 530 diff changeset	671 if (skipped(T.LParen))
192 5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	672 {
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	673 func.outIdent = requireIdentifier(MSG.ExpectedAnIdentifier);
192 5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	674 require(T.RParen);
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	675 }
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	676 func.outBody = parseStatements();
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	677 continue;
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	678 case T.Body:
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	679 nT();
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	680 goto case T.LBrace;
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	681 default:
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	682 error(token, MSG.ExpectedFunctionBody, token.srcText);
192 5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	683 }
342 f13d551d7c4f - Added error messages MID.InContract and MID.OutContract. aziz parents: 341 diff changeset	684 break; // Exit loop.
192 5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	685 }
268 c19b68a4e3db - FunctionBody inherits from Node now. aziz parents: 267 diff changeset	686 set(func, begin);
299 559d5d62e0c1 - Added checks for null before adding member to Node.children. aziz parents: 298 diff changeset	687 func.finishConstruction();
193 2a2975b6d539 - Using parseFunctionBody() when parsing FunctionLiteralExpression. aziz parents: 192 diff changeset	688 return func;
192 5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	689 }
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	690
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	691 LinkageType parseLinkageType()
359 511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	692 {
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	693 LinkageType linkageType;
359 511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	694 if (token.type != T.LParen)
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	695 return linkageType;
359 511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	696
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	697 nT(); // Skip (
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	698 if (token.type == T.RParen)
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	699 {
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	700 nT();
359 511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	701 error(MID.MissingLinkageType);
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	702 return linkageType;
359 511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	703 }
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	704
502 4e14cd1b24da Refactored code and added modules related to tabulated Identifiers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 501 diff changeset	705 auto identTok = requireId();
4e14cd1b24da Refactored code and added modules related to tabulated Identifiers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 501 diff changeset	706
4e14cd1b24da Refactored code and added modules related to tabulated Identifiers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 501 diff changeset	707 ID identID = identTok ? identTok.ident.identID : ID.Null;
4e14cd1b24da Refactored code and added modules related to tabulated Identifiers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 501 diff changeset	708
4e14cd1b24da Refactored code and added modules related to tabulated Identifiers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 501 diff changeset	709 switch (identID)
359 511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	710 {
502 4e14cd1b24da Refactored code and added modules related to tabulated Identifiers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 501 diff changeset	711 case ID.C:
531 315aeb3f7a9b Added method skipped() to dil.Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 530 diff changeset	712 if (skipped(T.PlusPlus))
359 511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	713 {
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	714 linkageType = LinkageType.Cpp;
359 511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	715 break;
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	716 }
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	717 linkageType = LinkageType.C;
359 511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	718 break;
502 4e14cd1b24da Refactored code and added modules related to tabulated Identifiers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 501 diff changeset	719 case ID.D:
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	720 linkageType = LinkageType.D;
359 511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	721 break;
502 4e14cd1b24da Refactored code and added modules related to tabulated Identifiers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 501 diff changeset	722 case ID.Windows:
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	723 linkageType = LinkageType.Windows;
359 511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	724 break;
502 4e14cd1b24da Refactored code and added modules related to tabulated Identifiers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 501 diff changeset	725 case ID.Pascal:
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	726 linkageType = LinkageType.Pascal;
359 511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	727 break;
502 4e14cd1b24da Refactored code and added modules related to tabulated Identifiers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 501 diff changeset	728 case ID.System:
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	729 linkageType = LinkageType.System;
359 511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	730 break;
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	731 default:
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	732 error(MID.UnrecognizedLinkageType, token.srcText);
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	733 }
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	734 require(T.RParen);
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	735 return linkageType;
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	736 }
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	737
496 5a607597dc22 Improved error recovery in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 495 diff changeset	738 void checkLinkageType(ref LinkageType prev_lt, LinkageType lt, Token* begin)
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	739 {
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	740 if (prev_lt == LinkageType.None)
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	741 prev_lt = lt;
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	742 else
616 506ce60760d8 Fixed some error messages. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 608 diff changeset	743 error(begin, MSG.RedundantLinkageType, Token.textSpan(begin, this.prevToken));
359 511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	744 }
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	745
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	746 Declaration parseStorageAttribute()
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	747 {
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	748 StorageClass stc, stc_tmp;
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	749 LinkageType prev_linkageType;
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	750
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	751 auto saved_storageClass = this.storageClass; // Save.
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	752 // Nested function.
305 df237b3b5f09 - Added class Declarations. aziz parents: 304 diff changeset	753 Declaration parse()
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	754 {
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	755 Declaration decl;
359 511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType. aziz parents: 358 diff changeset	756 auto begin = token;
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	757 switch (token.type)
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	758 {
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	759 case T.Extern:
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	760 if (peekNext() != T.LParen)
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	761 {
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	762 stc_tmp = StorageClass.Extern;
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	763 goto Lcommon;
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	764 }
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	765
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	766 nT();
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	767 auto linkageType = parseLinkageType();
496 5a607597dc22 Improved error recovery in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 495 diff changeset	768 checkLinkageType(prev_linkageType, linkageType, begin);
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	769
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	770 auto saved = this.linkageType; // Save.
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	771 this.linkageType = linkageType; // Set.
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	772 decl = new LinkageDeclaration(linkageType, parse());
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	773 set(decl, begin);
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	774 this.linkageType = saved; // Restore.
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	775 break;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	776 case T.Override:
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	777 stc_tmp = StorageClass.Override;
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	778 goto Lcommon;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	779 case T.Deprecated:
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	780 stc_tmp = StorageClass.Deprecated;
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	781 goto Lcommon;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	782 case T.Abstract:
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	783 stc_tmp = StorageClass.Abstract;
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	784 goto Lcommon;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	785 case T.Synchronized:
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	786 stc_tmp = StorageClass.Synchronized;
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	787 goto Lcommon;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	788 case T.Static:
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	789 stc_tmp = StorageClass.Static;
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	790 goto Lcommon;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	791 case T.Final:
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	792 stc_tmp = StorageClass.Final;
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	793 goto Lcommon;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	794 case T.Const:
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	795 version(D2)
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	796 {
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	797 if (peekNext() == T.LParen)
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	798 goto case_Declaration;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	799 }
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	800 stc_tmp = StorageClass.Const;
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	801 goto Lcommon;
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	802 version(D2)
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	803 {
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	804 case T.Invariant: // D 2.0
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	805 auto next = token;
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	806 if (peekAfter(next) == T.LParen)
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	807 {
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	808 if (peekAfter(next) != T.RParen)
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	809 goto case_Declaration; // invariant ( Type )
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	810 decl = parseDeclarationDefinition(); // invariant ( )
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	811 decl.setStorageClass(stc);
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	812 break;
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	813 }
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	814 // invariant as StorageClass.
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	815 stc_tmp = StorageClass.Invariant;
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	816 goto Lcommon;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	817 }
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	818 case T.Auto:
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	819 stc_tmp = StorageClass.Auto;
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	820 goto Lcommon;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	821 case T.Scope:
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	822 stc_tmp = StorageClass.Scope;
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	823 goto Lcommon;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	824 Lcommon:
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	825 // Issue error if redundant.
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	826 if (stc & stc_tmp)
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	827 error(MID.RedundantStorageClass, token.srcText);
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	828 else
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	829 stc \|= stc_tmp;
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	830
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	831 nT();
650 eb490ba8dba0 Made AttributeDeclaration abstract. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 646 diff changeset	832 decl = new StorageClassDeclaration(stc_tmp, parse());
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	833 set(decl, begin);
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	834 break;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	835 case T.Identifier:
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	836 case_Declaration:
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	837 // This could be a normal Declaration or an AutoDeclaration
501 949a53332c66 Fixed parsing of AutoDeclarations. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 496 diff changeset	838 decl = parseVariableOrFunction(stc, this.protection, prev_linkageType, true);
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	839 break;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	840 default:
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	841 this.storageClass = stc; // Set.
305 df237b3b5f09 - Added class Declarations. aziz parents: 304 diff changeset	842 decl = parseDeclarationsBlock();
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	843 this.storageClass = saved_storageClass; // Reset.
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	844 }
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	845 assert(isNodeSet(decl));
305 df237b3b5f09 - Added class Declarations. aziz parents: 304 diff changeset	846 return decl;
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	847 }
305 df237b3b5f09 - Added class Declarations. aziz parents: 304 diff changeset	848 return parse();
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	849 }
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	850
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	851 uint parseAlignAttribute()
260 b83180748ae6 - Added method parseAlignAttribute(). aziz parents: 259 diff changeset	852 {
b83180748ae6 - Added method parseAlignAttribute(). aziz parents: 259 diff changeset	853 assert(token.type == T.Align);
b83180748ae6 - Added method parseAlignAttribute(). aziz parents: 259 diff changeset	854 nT(); // Skip align keyword.
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	855 uint size = DEFAULT_ALIGN_SIZE; // Global default.
531 315aeb3f7a9b Added method skipped() to dil.Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 530 diff changeset	856 if (skipped(T.LParen))
260 b83180748ae6 - Added method parseAlignAttribute(). aziz parents: 259 diff changeset	857 {
b83180748ae6 - Added method parseAlignAttribute(). aziz parents: 259 diff changeset	858 if (token.type == T.Int32)
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	859 (size = token.int_), nT();
260 b83180748ae6 - Added method parseAlignAttribute(). aziz parents: 259 diff changeset	860 else
b83180748ae6 - Added method parseAlignAttribute(). aziz parents: 259 diff changeset	861 expected(T.Int32);
b83180748ae6 - Added method parseAlignAttribute(). aziz parents: 259 diff changeset	862 require(T.RParen);
b83180748ae6 - Added method parseAlignAttribute(). aziz parents: 259 diff changeset	863 }
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	864 return size;
260 b83180748ae6 - Added method parseAlignAttribute(). aziz parents: 259 diff changeset	865 }
b83180748ae6 - Added method parseAlignAttribute(). aziz parents: 259 diff changeset	866
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	867 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	868 {
146 8180eb84e69c - Started implementation of parseAttributeSpecifier(). aziz parents: 145 diff changeset	869 Declaration decl;
8180eb84e69c - Started implementation of parseAttributeSpecifier(). aziz parents: 145 diff changeset	870
8180eb84e69c - Started implementation of parseAttributeSpecifier(). aziz parents: 145 diff changeset	871 switch (token.type)
8180eb84e69c - Started implementation of parseAttributeSpecifier(). aziz parents: 145 diff changeset	872 {
8180eb84e69c - Started implementation of parseAttributeSpecifier(). aziz parents: 145 diff changeset	873 case T.Align:
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	874 uint alignSize = parseAlignAttribute();
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	875 auto saved = this.alignSize; // Save.
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	876 this.alignSize = alignSize; // Set.
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	877 decl = new AlignDeclaration(alignSize, parseDeclarationsBlock());
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	878 this.alignSize = saved; // Restore.
146 8180eb84e69c - Started implementation of parseAttributeSpecifier(). aziz parents: 145 diff changeset	879 break;
8180eb84e69c - Started implementation of parseAttributeSpecifier(). aziz parents: 145 diff changeset	880 case T.Pragma:
147 e46b3415ec16 - Implemented parsing pragma declarations. aziz parents: 146 diff changeset	881 // Pragma:
e46b3415ec16 - Implemented parsing pragma declarations. aziz parents: 146 diff changeset	882 // pragma ( Identifier )
e46b3415ec16 - Implemented parsing pragma declarations. aziz parents: 146 diff changeset	883 // pragma ( Identifier , ExpressionList )
e46b3415ec16 - Implemented parsing pragma declarations. aziz parents: 146 diff changeset	884 nT();
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	885 Identifier* ident;
147 e46b3415ec16 - Implemented parsing pragma declarations. aziz parents: 146 diff changeset	886 Expression[] args;
e46b3415ec16 - Implemented parsing pragma declarations. aziz parents: 146 diff changeset	887
e46b3415ec16 - Implemented parsing pragma declarations. aziz parents: 146 diff changeset	888 require(T.LParen);
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	889 ident = requireIdentifier(MSG.ExpectedPragmaIdentifier);
147 e46b3415ec16 - Implemented parsing pragma declarations. aziz parents: 146 diff changeset	890
531 315aeb3f7a9b Added method skipped() to dil.Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 530 diff changeset	891 if (skipped(T.Comma))
315aeb3f7a9b Added method skipped() to dil.Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 530 diff changeset	892 args = parseExpressionList();
486 bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	893 require(T.RParen);
147 e46b3415ec16 - Implemented parsing pragma declarations. aziz parents: 146 diff changeset	894
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	895 decl = new PragmaDeclaration(ident, args, parseDeclarationsBlock());
147 e46b3415ec16 - Implemented parsing pragma declarations. aziz parents: 146 diff changeset	896 break;
491 b991f49628a8 Forgot committing Parser.d as well. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 489 diff changeset	897 default:
b991f49628a8 Forgot committing Parser.d as well. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 489 diff changeset	898 // Protection attributes
b991f49628a8 Forgot committing Parser.d as well. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 489 diff changeset	899 Protection prot;
b991f49628a8 Forgot committing Parser.d as well. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 489 diff changeset	900 switch (token.type)
b991f49628a8 Forgot committing Parser.d as well. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 489 diff changeset	901 {
b991f49628a8 Forgot committing Parser.d as well. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 489 diff changeset	902 case T.Private:
b991f49628a8 Forgot committing Parser.d as well. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 489 diff changeset	903 prot = Protection.Private; break;
b991f49628a8 Forgot committing Parser.d as well. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 489 diff changeset	904 case T.Package:
b991f49628a8 Forgot committing Parser.d as well. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 489 diff changeset	905 prot = Protection.Package; break;
b991f49628a8 Forgot committing Parser.d as well. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 489 diff changeset	906 case T.Protected:
b991f49628a8 Forgot committing Parser.d as well. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 489 diff changeset	907 prot = Protection.Protected; break;
b991f49628a8 Forgot committing Parser.d as well. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 489 diff changeset	908 case T.Public:
b991f49628a8 Forgot committing Parser.d as well. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 489 diff changeset	909 prot = Protection.Public; break;
b991f49628a8 Forgot committing Parser.d as well. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 489 diff changeset	910 case T.Export:
b991f49628a8 Forgot committing Parser.d as well. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 489 diff changeset	911 prot = Protection.Export; break;
b991f49628a8 Forgot committing Parser.d as well. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 489 diff changeset	912 default:
b991f49628a8 Forgot committing Parser.d as well. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 489 diff changeset	913 assert(0);
b991f49628a8 Forgot committing Parser.d as well. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 489 diff changeset	914 }
150 753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	915 nT();
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	916 auto saved = this.protection; // Save.
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	917 this.protection = prot; // Set.
491 b991f49628a8 Forgot committing Parser.d as well. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 489 diff changeset	918 decl = new ProtectionDeclaration(prot, parseDeclarationsBlock());
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	919 this.protection = saved; // Restore.
146 8180eb84e69c - Started implementation of parseAttributeSpecifier(). aziz parents: 145 diff changeset	920 }
8180eb84e69c - Started implementation of parseAttributeSpecifier(). aziz parents: 145 diff changeset	921 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	922 }
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	923
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	924 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	925 {
107 722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	926 assert(token.type == T.Import \|\| token.type == T.Static);
531 315aeb3f7a9b Added method skipped() to dil.Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 530 diff changeset	927 bool isStatic = skipped(T.Static);
429 052cbacb1642 Fix: removed infinite loop when parsing static imports. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 424 diff changeset	928 assert(token.type == T.Import);
555 d9e328c3bab9 Fixed infinite loop in dil.Parser.parseMixin(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 539 diff changeset	929 nT(); // Skip import keyword.
429 052cbacb1642 Fix: removed infinite loop when parsing static imports. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 424 diff changeset	930
364 1059295c2727 - Every command module has an execute method now. aziz parents: 359 diff changeset	931 ModuleFQN[] moduleFQNs;
504 9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 502 diff changeset	932 Identifier*[] moduleAliases;
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 502 diff changeset	933 Identifier*[] bindNames;
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 502 diff changeset	934 Identifier*[] bindAliases;
114 83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	935
298 dc8bed242db5 - Fixed parsing ImportDeclaration. aziz parents: 297 diff changeset	936 while (1)
114 83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	937 {
364 1059295c2727 - Every command module has an execute method now. aziz parents: 359 diff changeset	938 ModuleFQN moduleFQN;
504 9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 502 diff changeset	939 Identifier* moduleAlias;
115 cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier(). aziz parents: 114 diff changeset	940
cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier(). aziz parents: 114 diff changeset	941 // AliasName = ModuleName
504 9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 502 diff changeset	942 if (peekNext() == T.Assign)
114 83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	943 {
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	944 moduleAlias = requireIdentifier(MSG.ExpectedAliasModuleName);
504 9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 502 diff changeset	945 nT(); // Skip =
114 83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	946 }
115 cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier(). aziz parents: 114 diff changeset	947
298 dc8bed242db5 - Fixed parsing ImportDeclaration. aziz parents: 297 diff changeset	948 // Identifier(.Identifier)*
504 9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 502 diff changeset	949 while (1)
114 83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	950 {
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	951 moduleFQN ~= requireIdentifier(MSG.ExpectedModuleIdentifier);
504 9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 502 diff changeset	952 if (token.type != T.Dot)
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 502 diff changeset	953 break;
114 83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	954 nT();
83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	955 }
83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	956
83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	957 // Push identifiers.
364 1059295c2727 - Every command module has an execute method now. aziz parents: 359 diff changeset	958 moduleFQNs ~= moduleFQN;
114 83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	959 moduleAliases ~= moduleAlias;
83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	960
298 dc8bed242db5 - Fixed parsing ImportDeclaration. aziz parents: 297 diff changeset	961 if (token.type != T.Comma)
dc8bed242db5 - Fixed parsing ImportDeclaration. aziz parents: 297 diff changeset	962 break;
dc8bed242db5 - Fixed parsing ImportDeclaration. aziz parents: 297 diff changeset	963 nT();
dc8bed242db5 - Fixed parsing ImportDeclaration. aziz parents: 297 diff changeset	964 }
dc8bed242db5 - Fixed parsing ImportDeclaration. aziz parents: 297 diff changeset	965
dc8bed242db5 - Fixed parsing ImportDeclaration. aziz parents: 297 diff changeset	966 if (token.type == T.Colon)
dc8bed242db5 - Fixed parsing ImportDeclaration. aziz parents: 297 diff changeset	967 {
dc8bed242db5 - Fixed parsing ImportDeclaration. aziz parents: 297 diff changeset	968 // BindAlias = BindName(, BindAlias = BindName)*;
dc8bed242db5 - Fixed parsing ImportDeclaration. aziz parents: 297 diff changeset	969 // BindName(, BindName)*;
320 0ce14640eb04 - Fix in parseImportDeclaration(): rewrote while loop and removed a call to nT(). aziz parents: 319 diff changeset	970 do
114 83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	971 {
298 dc8bed242db5 - Fixed parsing ImportDeclaration. aziz parents: 297 diff changeset	972 nT();
504 9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 502 diff changeset	973 Identifier* bindAlias;
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 502 diff changeset	974 // BindAlias = BindName
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 502 diff changeset	975 if (peekNext() == T.Assign)
114 83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	976 {
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	977 bindAlias = requireIdentifier(MSG.ExpectedAliasImportName);
504 9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 502 diff changeset	978 nT(); // Skip =
298 dc8bed242db5 - Fixed parsing ImportDeclaration. aziz parents: 297 diff changeset	979 }
dc8bed242db5 - Fixed parsing ImportDeclaration. aziz parents: 297 diff changeset	980 // Push identifiers.
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	981 bindNames ~= requireIdentifier(MSG.ExpectedImportName);
298 dc8bed242db5 - Fixed parsing ImportDeclaration. aziz parents: 297 diff changeset	982 bindAliases ~= bindAlias;
320 0ce14640eb04 - Fix in parseImportDeclaration(): rewrote while loop and removed a call to nT(). aziz parents: 319 diff changeset	983 } while (token.type == T.Comma)
298 dc8bed242db5 - Fixed parsing ImportDeclaration. aziz parents: 297 diff changeset	984 }
dc8bed242db5 - Fixed parsing ImportDeclaration. aziz parents: 297 diff changeset	985
114 83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	986 require(T.Semicolon);
83bb5190c0fc - Completed implementation of parseImportDeclaration(). aziz parents: 113 diff changeset	987
366 dcbd3bf9bf74 - Added command importgraph/igraph to main.d. aziz parents: 364 diff changeset	988 return new ImportDeclaration(moduleFQNs, moduleAliases, bindNames, bindAliases, isStatic);
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	989 }
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	990
107 722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	991 Declaration parseEnumDeclaration()
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	992 {
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	993 assert(token.type == T.Enum);
555 d9e328c3bab9 Fixed infinite loop in dil.Parser.parseMixin(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 539 diff changeset	994 nT(); // Skip enum keyword.
107 722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	995
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	996 Identifier* enumName;
107 722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	997 Type baseType;
406 e242f0ee2d27 Added class EnumMember. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 405 diff changeset	998 EnumMember[] members;
126 0f0e7352e91d - Renamed member hasDefinition of class Declaration to hasBody. aziz parents: 125 diff changeset	999 bool hasBody;
107 722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	1000
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	1001 enumName = optionalIdentifier();
107 722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	1002
531 315aeb3f7a9b Added method skipped() to dil.Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 530 diff changeset	1003 if (skipped(T.Colon))
107 722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	1004 baseType = parseBasicType();
531 315aeb3f7a9b Added method skipped() to dil.Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 530 diff changeset	1005
639 1b1315ac27a4 Added two error messages. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 638 diff changeset	1006 if (enumName && skipped(T.Semicolon))
1b1315ac27a4 Added two error messages. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 638 diff changeset	1007 {}
531 315aeb3f7a9b Added method skipped() to dil.Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 530 diff changeset	1008 else if (skipped(T.LBrace))
107 722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	1009 {
126 0f0e7352e91d - Renamed member hasDefinition of class Declaration to hasBody. aziz parents: 125 diff changeset	1010 hasBody = true;
398 f7bb892d64c2 Fixed Parser.parseEnumDeclaration(): empty enums are allowed now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 396 diff changeset	1011 while (token.type != T.RBrace)
107 722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	1012 {
406 e242f0ee2d27 Added class EnumMember. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 405 diff changeset	1013 auto begin = token;
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	1014 auto name = requireIdentifier(MSG.ExpectedEnumMember);
406 e242f0ee2d27 Added class EnumMember. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 405 diff changeset	1015 Expression value;
107 722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	1016
531 315aeb3f7a9b Added method skipped() to dil.Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 530 diff changeset	1017 if (skipped(T.Assign))
315aeb3f7a9b Added method skipped() to dil.Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 530 diff changeset	1018 value = parseAssignExpression();
107 722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	1019 else
406 e242f0ee2d27 Added class EnumMember. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 405 diff changeset	1020 value = null;
e242f0ee2d27 Added class EnumMember. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 405 diff changeset	1021
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	1022 members ~= set(new EnumMember(name, value), begin);
107 722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	1023
398 f7bb892d64c2 Fixed Parser.parseEnumDeclaration(): empty enums are allowed now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 396 diff changeset	1024 if (token.type != T.Comma)
115 cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier(). aziz parents: 114 diff changeset	1025 break;
398 f7bb892d64c2 Fixed Parser.parseEnumDeclaration(): empty enums are allowed now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 396 diff changeset	1026 nT(); // Skip ,
f7bb892d64c2 Fixed Parser.parseEnumDeclaration(): empty enums are allowed now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 396 diff changeset	1027 }
f7bb892d64c2 Fixed Parser.parseEnumDeclaration(): empty enums are allowed now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 396 diff changeset	1028 require(T.RBrace);
107 722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	1029 }
231 6846138a0e24 - Fixed parseEnumDeclaration(). aziz parents: 230 diff changeset	1030 else
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	1031 error(token, MSG.ExpectedEnumBody, token.srcText);
107 722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	1032
406 e242f0ee2d27 Added class EnumMember. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 405 diff changeset	1033 return new EnumDeclaration(enumName, baseType, members, hasBody);
107 722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	1034 }
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration. aziz parents: 106 diff changeset	1035
109 d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1036 Declaration parseClassDeclaration()
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1037 {
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1038 assert(token.type == T.Class);
555 d9e328c3bab9 Fixed infinite loop in dil.Parser.parseMixin(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 539 diff changeset	1039 nT(); // Skip class keyword.
109 d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1040
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	1041 Identifier* className;
258 112a57f433f2 - Created class TemplateParameters. aziz parents: 257 diff changeset	1042 TemplateParameters tparams;
668 a1f8d8f2db38 Renamed some identifiers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 659 diff changeset	1043 BaseClassType[] bases;
305 df237b3b5f09 - Added class Declarations. aziz parents: 304 diff changeset	1044 Declarations decls;
109 d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1045
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	1046 className = requireIdentifier(MSG.ExpectedClassName);
109 d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1047
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1048 if (token.type == T.LParen)
195 37c2ffd649c4 - Parsing template parameter list for class, interface, struct and union declarations. aziz parents: 194 diff changeset	1049 tparams = parseTemplateParameterList();
109 d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1050
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1051 if (token.type == T.Colon)
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1052 bases = parseBaseClasses();
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1053
639 1b1315ac27a4 Added two error messages. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 638 diff changeset	1054 if (bases.length == 0 && skipped(T.Semicolon))
1b1315ac27a4 Added two error messages. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 638 diff changeset	1055 {}
109 d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1056 else if (token.type == T.LBrace)
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	1057 decls = parseDeclarationDefinitionsBody();
109 d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1058 else
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	1059 error(token, MSG.ExpectedClassBody, token.srcText);
109 d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1060
494 9a7ca8c56e59 Refactored a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 493 diff changeset	1061 return new ClassDeclaration(className, tparams, bases, decls);
109 d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1062 }
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1063
668 a1f8d8f2db38 Renamed some identifiers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 659 diff changeset	1064 BaseClassType[] parseBaseClasses(bool colonLeadsOff = true)
109 d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1065 {
144 cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon. aziz parents: 143 diff changeset	1066 if (colonLeadsOff)
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon. aziz parents: 143 diff changeset	1067 {
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon. aziz parents: 143 diff changeset	1068 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	1069 nT(); // Skip colon
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon. aziz parents: 143 diff changeset	1070 }
109 d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1071
668 a1f8d8f2db38 Renamed some identifiers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 659 diff changeset	1072 BaseClassType[] bases;
109 d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1073
646 68953760d569 Added class ParenExpression. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 640 diff changeset	1074 do
109 d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1075 {
117 79857de26e86 - Moved class Parameter to module Types. Added struct Parameters. aziz parents: 116 diff changeset	1076 Protection prot = Protection.Public;
109 d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1077 switch (token.type)
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1078 {
204 082f30904456 - Allowing 'typeof' in BaseClassList. aziz parents: 203 diff changeset	1079 case T.Identifier, T.Dot, T.Typeof: goto LparseBasicType;
109 d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1080 case T.Private: prot = Protection.Private; break;
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1081 case T.Protected: prot = Protection.Protected; break;
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1082 case T.Package: prot = Protection.Package; break;
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1083 case T.Public: /prot = Protection.Public;/ break;
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1084 default:
405 e2529923a0cb Added two error messages. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 404 diff changeset	1085 error(MID.ExpectedBaseClasses, token.srcText);
109 d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1086 return bases;
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1087 }
158 759f437313f9 - Moved enum Protection and class BaseClass to module Types. aziz parents: 157 diff changeset	1088 nT(); // Skip protection attribute.
759f437313f9 - Moved enum Protection and class BaseClass to module Types. aziz parents: 157 diff changeset	1089 LparseBasicType:
486 bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	1090 auto begin = token;
158 759f437313f9 - Moved enum Protection and class BaseClass to module Types. aziz parents: 157 diff changeset	1091 auto type = parseBasicType();
668 a1f8d8f2db38 Renamed some identifiers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 659 diff changeset	1092 bases ~= set(new BaseClassType(prot, type), begin);
646 68953760d569 Added class ParenExpression. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 640 diff changeset	1093 } while (skipped(T.Comma))
109 d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1094 return bases;
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1095 }
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses(). aziz parents: 108 diff changeset	1096
112 004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	1097 Declaration parseInterfaceDeclaration()
004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	1098 {
004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	1099 assert(token.type == T.Interface);
555 d9e328c3bab9 Fixed infinite loop in dil.Parser.parseMixin(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 539 diff changeset	1100 nT(); // Skip interface keyword.
112 004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	1101
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	1102 Identifier* name;
258 112a57f433f2 - Created class TemplateParameters. aziz parents: 257 diff changeset	1103 TemplateParameters tparams;
668 a1f8d8f2db38 Renamed some identifiers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 659 diff changeset	1104 BaseClassType[] bases;
305 df237b3b5f09 - Added class Declarations. aziz parents: 304 diff changeset	1105 Declarations decls;
112 004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	1106
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	1107 name = requireIdentifier(MSG.ExpectedInterfaceName);
112 004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	1108
004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	1109 if (token.type == T.LParen)
195 37c2ffd649c4 - Parsing template parameter list for class, interface, struct and union declarations. aziz parents: 194 diff changeset	1110 tparams = parseTemplateParameterList();
112 004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	1111
004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	1112 if (token.type == T.Colon)
004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	1113 bases = parseBaseClasses();
004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	1114
639 1b1315ac27a4 Added two error messages. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 638 diff changeset	1115 if (bases.length == 0 && skipped(T.Semicolon))
1b1315ac27a4 Added two error messages. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 638 diff changeset	1116 {}
112 004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	1117 else if (token.type == T.LBrace)
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	1118 decls = parseDeclarationDefinitionsBody();
112 004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	1119 else
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	1120 error(token, MSG.ExpectedInterfaceBody, token.srcText);
112 004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	1121
494 9a7ca8c56e59 Refactored a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 493 diff changeset	1122 return new InterfaceDeclaration(name, tparams, bases, decls);
112 004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	1123 }
004d98df65af - Implemented parseInterfaceDeclaration(). aziz parents: 111 diff changeset	1124
638 7131c07997f9 Renamed parseAggregateDeclaration() to parseStructOrUnionDeclaration(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 637 diff changeset	1125 Declaration parseStructOrUnionDeclaration()
113 20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	1126 {
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	1127 assert(token.type == T.Struct \|\| token.type == T.Union);
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	1128 TOK tok = token.type;
555 d9e328c3bab9 Fixed infinite loop in dil.Parser.parseMixin(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 539 diff changeset	1129 nT(); // Skip struct or union keyword.
113 20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	1130
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	1131 Identifier* name;
258 112a57f433f2 - Created class TemplateParameters. aziz parents: 257 diff changeset	1132 TemplateParameters tparams;
305 df237b3b5f09 - Added class Declarations. aziz parents: 304 diff changeset	1133 Declarations decls;
113 20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	1134
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	1135 name = optionalIdentifier();
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	1136
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	1137 if (name && token.type == T.LParen)
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	1138 tparams = parseTemplateParameterList();
113 20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	1139
639 1b1315ac27a4 Added two error messages. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 638 diff changeset	1140 if (name && skipped(T.Semicolon))
1b1315ac27a4 Added two error messages. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 638 diff changeset	1141 {}
113 20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	1142 else if (token.type == T.LBrace)
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	1143 decls = parseDeclarationDefinitionsBody();
113 20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	1144 else
639 1b1315ac27a4 Added two error messages. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 638 diff changeset	1145 error(token, tok == T.Struct ?
1b1315ac27a4 Added two error messages. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 638 diff changeset	1146 MSG.ExpectedStructBody :
1b1315ac27a4 Added two error messages. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 638 diff changeset	1147 MSG.ExpectedUnionBody, token.srcText);
113 20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	1148
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	1149 if (tok == T.Struct)
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	1150 {
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	1151 auto sd = new StructDeclaration(name, tparams, decls);
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	1152 sd.setAlignSize(this.alignSize);
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	1153 return sd;
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	1154 }
113 20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	1155 else
494 9a7ca8c56e59 Refactored a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 493 diff changeset	1156 return new UnionDeclaration(name, tparams, decls);
113 20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	1157 }
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations. aziz parents: 112 diff changeset	1158
117 79857de26e86 - Moved class Parameter to module Types. Added struct Parameters. aziz parents: 116 diff changeset	1159 Declaration parseConstructorDeclaration()
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters. aziz parents: 116 diff changeset	1160 {
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters. aziz parents: 116 diff changeset	1161 assert(token.type == T.This);
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters. aziz parents: 116 diff changeset	1162 nT(); // Skip 'this' keyword.
143 e760d7552f66 - Renamed parseArgumentList() to parseArguments(). aziz parents: 141 diff changeset	1163 auto parameters = parseParameterList();
267 f3dfa6208ed3 - Removed parameter func from parseFunctionBody(). Creating new FunctionBody inside the method. aziz parents: 266 diff changeset	1164 auto funcBody = parseFunctionBody();
197 ff32eb87300e - Using parseFunctionBody() for Constructor-,Destructor-,StaticConstructor-,StaticDestructor-,Invariant-,Unittest-,New- and DeleteDeclaration. aziz parents: 196 diff changeset	1165 return new ConstructorDeclaration(parameters, funcBody);
117 79857de26e86 - Moved class Parameter to module Types. Added struct Parameters. aziz parents: 116 diff changeset	1166 }
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters. aziz parents: 116 diff changeset	1167
118 379f33cbd521 - Added parseDestructorDeclaration() and DestructorDeclaration class. aziz parents: 117 diff changeset	1168 Declaration parseDestructorDeclaration()
379f33cbd521 - Added parseDestructorDeclaration() and DestructorDeclaration class. aziz parents: 117 diff changeset	1169 {
379f33cbd521 - Added parseDestructorDeclaration() and DestructorDeclaration class. aziz parents: 117 diff changeset	1170 assert(token.type == T.Tilde);
379f33cbd521 - Added parseDestructorDeclaration() and DestructorDeclaration class. aziz parents: 117 diff changeset	1171 nT(); // Skip ~
379f33cbd521 - Added parseDestructorDeclaration() and DestructorDeclaration class. aziz parents: 117 diff changeset	1172 require(T.This);
379f33cbd521 - Added parseDestructorDeclaration() and DestructorDeclaration class. aziz parents: 117 diff changeset	1173 require(T.LParen);
379f33cbd521 - Added parseDestructorDeclaration() and DestructorDeclaration class. aziz parents: 117 diff changeset	1174 require(T.RParen);
267 f3dfa6208ed3 - Removed parameter func from parseFunctionBody(). Creating new FunctionBody inside the method. aziz parents: 266 diff changeset	1175 auto funcBody = parseFunctionBody();
197 ff32eb87300e - Using parseFunctionBody() for Constructor-,Destructor-,StaticConstructor-,StaticDestructor-,Invariant-,Unittest-,New- and DeleteDeclaration. aziz parents: 196 diff changeset	1176 return new DestructorDeclaration(funcBody);
118 379f33cbd521 - Added parseDestructorDeclaration() and DestructorDeclaration class. aziz parents: 117 diff changeset	1177 }
379f33cbd521 - Added parseDestructorDeclaration() and DestructorDeclaration class. aziz parents: 117 diff changeset	1178
119 363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	1179 Declaration parseStaticConstructorDeclaration()
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	1180 {
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	1181 assert(token.type == T.Static);
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	1182 nT(); // Skip static keyword.
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	1183 nT(); // Skip 'this' keyword.
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	1184 require(T.LParen);
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	1185 require(T.RParen);
267 f3dfa6208ed3 - Removed parameter func from parseFunctionBody(). Creating new FunctionBody inside the method. aziz parents: 266 diff changeset	1186 auto funcBody = parseFunctionBody();
197 ff32eb87300e - Using parseFunctionBody() for Constructor-,Destructor-,StaticConstructor-,StaticDestructor-,Invariant-,Unittest-,New- and DeleteDeclaration. aziz parents: 196 diff changeset	1187 return new StaticConstructorDeclaration(funcBody);
119 363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	1188 }
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	1189
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	1190 Declaration parseStaticDestructorDeclaration()
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	1191 {
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	1192 assert(token.type == T.Static);
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	1193 nT(); // Skip static keyword.
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	1194 nT(); // Skip ~
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	1195 require(T.This);
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	1196 require(T.LParen);
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	1197 require(T.RParen);
267 f3dfa6208ed3 - Removed parameter func from parseFunctionBody(). Creating new FunctionBody inside the method. aziz parents: 266 diff changeset	1198 auto funcBody = parseFunctionBody();
197 ff32eb87300e - Using parseFunctionBody() for Constructor-,Destructor-,StaticConstructor-,StaticDestructor-,Invariant-,Unittest-,New- and DeleteDeclaration. aziz parents: 196 diff changeset	1199 return new StaticDestructorDeclaration(funcBody);
119 363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	1200 }
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration(). aziz parents: 118 diff changeset	1201
120 e5329dac0405 - Added parseInvariantDeclaration(). aziz parents: 119 diff changeset	1202 Declaration parseInvariantDeclaration()
e5329dac0405 - Added parseInvariantDeclaration(). aziz parents: 119 diff changeset	1203 {
e5329dac0405 - Added parseInvariantDeclaration(). aziz parents: 119 diff changeset	1204 assert(token.type == T.Invariant);
e5329dac0405 - Added parseInvariantDeclaration(). aziz parents: 119 diff changeset	1205 nT(); // Skip invariant keyword.
e5329dac0405 - Added parseInvariantDeclaration(). aziz parents: 119 diff changeset	1206 // Optional () for getting ready porting to D 2.0
e5329dac0405 - Added parseInvariantDeclaration(). aziz parents: 119 diff changeset	1207 if (token.type == T.LParen)
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	1208 requireNext(T.RParen);
267 f3dfa6208ed3 - Removed parameter func from parseFunctionBody(). Creating new FunctionBody inside the method. aziz parents: 266 diff changeset	1209 auto funcBody = parseFunctionBody();
197 ff32eb87300e - Using parseFunctionBody() for Constructor-,Destructor-,StaticConstructor-,StaticDestructor-,Invariant-,Unittest-,New- and DeleteDeclaration. aziz parents: 196 diff changeset	1210 return new InvariantDeclaration(funcBody);
120 e5329dac0405 - Added parseInvariantDeclaration(). aziz parents: 119 diff changeset	1211 }
e5329dac0405 - Added parseInvariantDeclaration(). aziz parents: 119 diff changeset	1212
121 030933c6b5f0 - Added parseUnittestDeclaration(). aziz parents: 120 diff changeset	1213 Declaration parseUnittestDeclaration()
030933c6b5f0 - Added parseUnittestDeclaration(). aziz parents: 120 diff changeset	1214 {
030933c6b5f0 - Added parseUnittestDeclaration(). aziz parents: 120 diff changeset	1215 assert(token.type == T.Unittest);
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	1216 nT(); // Skip unittest keyword.
267 f3dfa6208ed3 - Removed parameter func from parseFunctionBody(). Creating new FunctionBody inside the method. aziz parents: 266 diff changeset	1217 auto funcBody = parseFunctionBody();
197 ff32eb87300e - Using parseFunctionBody() for Constructor-,Destructor-,StaticConstructor-,StaticDestructor-,Invariant-,Unittest-,New- and DeleteDeclaration. aziz parents: 196 diff changeset	1218 return new UnittestDeclaration(funcBody);
121 030933c6b5f0 - Added parseUnittestDeclaration(). aziz parents: 120 diff changeset	1219 }
030933c6b5f0 - Added parseUnittestDeclaration(). aziz parents: 120 diff changeset	1220
529 135e9e6933a7 Tidied up version/debug parser functions. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 528 diff changeset	1221 Token* parseIdentOrInt()
135e9e6933a7 Tidied up version/debug parser functions. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 528 diff changeset	1222 {
531 315aeb3f7a9b Added method skipped() to dil.Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 530 diff changeset	1223 if (skipped(T.Int32) \|\| skipped(T.Identifier))
315aeb3f7a9b Added method skipped() to dil.Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 530 diff changeset	1224 return this.prevToken;
315aeb3f7a9b Added method skipped() to dil.Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 530 diff changeset	1225 error(token, MSG.ExpectedIdentOrInt, token.srcText);
529 135e9e6933a7 Tidied up version/debug parser functions. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 528 diff changeset	1226 return null;
135e9e6933a7 Tidied up version/debug parser functions. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 528 diff changeset	1227 }
135e9e6933a7 Tidied up version/debug parser functions. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 528 diff changeset	1228
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	1229 Declaration parseDebugDeclaration()
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	1230 {
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	1231 assert(token.type == T.Debug);
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	1232 nT(); // Skip debug keyword.
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	1233
529 135e9e6933a7 Tidied up version/debug parser functions. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 528 diff changeset	1234 Token* spec;
135e9e6933a7 Tidied up version/debug parser functions. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 528 diff changeset	1235 Token* cond;
305 df237b3b5f09 - Added class Declarations. aziz parents: 304 diff changeset	1236 Declaration decls, elseDecls;
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	1237
531 315aeb3f7a9b Added method skipped() to dil.Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 530 diff changeset	1238 if (skipped(T.Assign))
529 135e9e6933a7 Tidied up version/debug parser functions. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 528 diff changeset	1239 { // debug = Integer ;
135e9e6933a7 Tidied up version/debug parser functions. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 528 diff changeset	1240 // debug = Identifier ;
135e9e6933a7 Tidied up version/debug parser functions. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 528 diff changeset	1241 spec = parseIdentOrInt();
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	1242 require(T.Semicolon);
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	1243 }
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	1244 else
529 135e9e6933a7 Tidied up version/debug parser functions. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 528 diff changeset	1245 { // ( Condition )
531 315aeb3f7a9b Added method skipped() to dil.Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 530 diff changeset	1246 if (skipped(T.LParen))
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	1247 {
529 135e9e6933a7 Tidied up version/debug parser functions. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 528 diff changeset	1248 cond = parseIdentOrInt();
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	1249 require(T.RParen);
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	1250 }
123 0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1251 // debug DeclarationsBlock
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1252 // debug ( Condition ) DeclarationsBlock
404 fe46b5ea7a18 Added method parseDeclarationsBlockNoColon(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 400 diff changeset	1253 decls = parseDeclarationsBlockNoColon();
123 0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1254 // else DeclarationsBlock
531 315aeb3f7a9b Added method skipped() to dil.Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 530 diff changeset	1255 if (skipped(T.Else))
315aeb3f7a9b Added method skipped() to dil.Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 530 diff changeset	1256 elseDecls = parseDeclarationsBlockNoColon();
123 0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1257 }
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1258
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	1259 return new DebugDeclaration(spec, cond, decls, elseDecls);
123 0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1260 }
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1261
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1262 Declaration parseVersionDeclaration()
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1263 {
146 8180eb84e69c - Started implementation of parseAttributeSpecifier(). aziz parents: 145 diff changeset	1264 assert(token.type == T.Version);
8180eb84e69c - Started implementation of parseAttributeSpecifier(). aziz parents: 145 diff changeset	1265 nT(); // Skip version keyword.
123 0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1266
529 135e9e6933a7 Tidied up version/debug parser functions. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 528 diff changeset	1267 Token* spec;
135e9e6933a7 Tidied up version/debug parser functions. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 528 diff changeset	1268 Token* cond;
305 df237b3b5f09 - Added class Declarations. aziz parents: 304 diff changeset	1269 Declaration decls, elseDecls;
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	1270
531 315aeb3f7a9b Added method skipped() to dil.Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 530 diff changeset	1271 if (skipped(T.Assign))
529 135e9e6933a7 Tidied up version/debug parser functions. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 528 diff changeset	1272 { // version = Integer ;
135e9e6933a7 Tidied up version/debug parser functions. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 528 diff changeset	1273 // version = Identifier ;
135e9e6933a7 Tidied up version/debug parser functions. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 528 diff changeset	1274 spec = parseIdentOrInt();
123 0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1275 require(T.Semicolon);
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1276 }
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1277 else
529 135e9e6933a7 Tidied up version/debug parser functions. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 528 diff changeset	1278 { // ( Condition )
123 0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1279 require(T.LParen);
529 135e9e6933a7 Tidied up version/debug parser functions. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 528 diff changeset	1280 cond = parseIdentOrInt();
123 0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1281 require(T.RParen);
0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1282 // version ( Condition ) DeclarationsBlock
404 fe46b5ea7a18 Added method parseDeclarationsBlockNoColon(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 400 diff changeset	1283 decls = parseDeclarationsBlockNoColon();
123 0f55c0ac6589 - Added method parseVersionDeclaration(). aziz parents: 122 diff changeset	1284 // else DeclarationsBlock
531 315aeb3f7a9b Added method skipped() to dil.Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 530 diff changeset	1285 if (skipped(T.Else))
315aeb3f7a9b Added method skipped() to dil.Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 530 diff changeset	1286 elseDecls = parseDeclarationsBlockNoColon();
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	1287 }
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	1288
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	1289 return new VersionDeclaration(spec, cond, decls, elseDecls);
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	1290 }
9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	1291
125 240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	1292 Declaration parseStaticIfDeclaration()
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	1293 {
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	1294 assert(token.type == T.Static);
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	1295 nT(); // Skip static keyword.
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	1296 nT(); // Skip if keyword.
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	1297
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	1298 Expression condition;
305 df237b3b5f09 - Added class Declarations. aziz parents: 304 diff changeset	1299 Declaration ifDecls, elseDecls;
125 240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	1300
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	1301 require(T.LParen);
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	1302 condition = parseAssignExpression();
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	1303 require(T.RParen);
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	1304
404 fe46b5ea7a18 Added method parseDeclarationsBlockNoColon(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 400 diff changeset	1305 ifDecls = parseDeclarationsBlockNoColon();
125 240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	1306
531 315aeb3f7a9b Added method skipped() to dil.Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 530 diff changeset	1307 if (skipped(T.Else))
404 fe46b5ea7a18 Added method parseDeclarationsBlockNoColon(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 400 diff changeset	1308 elseDecls = parseDeclarationsBlockNoColon();
125 240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	1309
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	1310 return new StaticIfDeclaration(condition, ifDecls, elseDecls);
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	1311 }
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration. aziz parents: 124 diff changeset	1312
127 cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration. aziz parents: 126 diff changeset	1313 Declaration parseStaticAssertDeclaration()
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration. aziz parents: 126 diff changeset	1314 {
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration. aziz parents: 126 diff changeset	1315 assert(token.type == T.Static);
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration. aziz parents: 126 diff changeset	1316 nT(); // Skip static keyword.
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration. aziz parents: 126 diff changeset	1317 nT(); // Skip assert keyword.
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration. aziz parents: 126 diff changeset	1318 Expression condition, message;
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration. aziz parents: 126 diff changeset	1319 require(T.LParen);
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration. aziz parents: 126 diff changeset	1320 condition = parseAssignExpression();
531 315aeb3f7a9b Added method skipped() to dil.Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 530 diff changeset	1321 if (skipped(T.Comma))
127 cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration. aziz parents: 126 diff changeset	1322 message = parseAssignExpression();
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration. aziz parents: 126 diff changeset	1323 require(T.RParen);
128 e02b87281b4e - Static asserts have to end with a semicolon. aziz parents: 127 diff changeset	1324 require(T.Semicolon);
127 cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration. aziz parents: 126 diff changeset	1325 return new StaticAssertDeclaration(condition, message);
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration. aziz parents: 126 diff changeset	1326 }
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration. aziz parents: 126 diff changeset	1327
140 64d7186b087c - Implemented parseTemplateParameters(). aziz parents: 139 diff changeset	1328 Declaration parseTemplateDeclaration()
64d7186b087c - Implemented parseTemplateParameters(). aziz parents: 139 diff changeset	1329 {
64d7186b087c - Implemented parseTemplateParameters(). aziz parents: 139 diff changeset	1330 assert(token.type == T.Template);
64d7186b087c - Implemented parseTemplateParameters(). aziz parents: 139 diff changeset	1331 nT(); // Skip template keyword.
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	1332 auto templateName = requireIdentifier(MSG.ExpectedTemplateName);
143 e760d7552f66 - Renamed parseArgumentList() to parseArguments(). aziz parents: 141 diff changeset	1333 auto templateParams = parseTemplateParameterList();
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	1334 auto decls = parseDeclarationDefinitionsBody();
140 64d7186b087c - Implemented parseTemplateParameters(). aziz parents: 139 diff changeset	1335 return new TemplateDeclaration(templateName, templateParams, decls);
64d7186b087c - Implemented parseTemplateParameters(). aziz parents: 139 diff changeset	1336 }
64d7186b087c - Implemented parseTemplateParameters(). aziz parents: 139 diff changeset	1337
141 7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration(). aziz parents: 140 diff changeset	1338 Declaration parseNewDeclaration()
7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration(). aziz parents: 140 diff changeset	1339 {
7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration(). aziz parents: 140 diff changeset	1340 assert(token.type == T.New);
7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration(). aziz parents: 140 diff changeset	1341 nT(); // Skip new keyword.
143 e760d7552f66 - Renamed parseArgumentList() to parseArguments(). aziz parents: 141 diff changeset	1342 auto parameters = parseParameterList();
267 f3dfa6208ed3 - Removed parameter func from parseFunctionBody(). Creating new FunctionBody inside the method. aziz parents: 266 diff changeset	1343 auto funcBody = parseFunctionBody();
197 ff32eb87300e - Using parseFunctionBody() for Constructor-,Destructor-,StaticConstructor-,StaticDestructor-,Invariant-,Unittest-,New- and DeleteDeclaration. aziz parents: 196 diff changeset	1344 return new NewDeclaration(parameters, funcBody);
141 7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration(). aziz parents: 140 diff changeset	1345 }
7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration(). aziz parents: 140 diff changeset	1346
7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration(). aziz parents: 140 diff changeset	1347 Declaration parseDeleteDeclaration()
7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration(). aziz parents: 140 diff changeset	1348 {
7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration(). aziz parents: 140 diff changeset	1349 assert(token.type == T.Delete);
7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration(). aziz parents: 140 diff changeset	1350 nT(); // Skip delete keyword.
143 e760d7552f66 - Renamed parseArgumentList() to parseArguments(). aziz parents: 141 diff changeset	1351 auto parameters = parseParameterList();
267 f3dfa6208ed3 - Removed parameter func from parseFunctionBody(). Creating new FunctionBody inside the method. aziz parents: 266 diff changeset	1352 auto funcBody = parseFunctionBody();
197 ff32eb87300e - Using parseFunctionBody() for Constructor-,Destructor-,StaticConstructor-,StaticDestructor-,Invariant-,Unittest-,New- and DeleteDeclaration. aziz parents: 196 diff changeset	1353 return new DeleteDeclaration(parameters, funcBody);
141 7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration(). aziz parents: 140 diff changeset	1354 }
7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration(). aziz parents: 140 diff changeset	1355
492 9c208925a3d4 Added module ImportParser and new stuff from DMD2.008. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 491 diff changeset	1356 Type parseTypeofType()
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 491 diff changeset	1357 {
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 491 diff changeset	1358 assert(token.type == T.Typeof);
618 07946b379006 Refactored the way dot expressions are parsed. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 616 diff changeset	1359 auto begin = token;
492 9c208925a3d4 Added module ImportParser and new stuff from DMD2.008. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 491 diff changeset	1360 Type type;
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 491 diff changeset	1361 requireNext(T.LParen);
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 491 diff changeset	1362 switch (token.type)
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 491 diff changeset	1363 {
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 491 diff changeset	1364 version(D2)
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 491 diff changeset	1365 {
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 491 diff changeset	1366 case T.Return:
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 491 diff changeset	1367 nT();
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 491 diff changeset	1368 type = new TypeofType();
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 491 diff changeset	1369 break;
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 491 diff changeset	1370 }
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 491 diff changeset	1371 default:
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 491 diff changeset	1372 type = new TypeofType(parseExpression());
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 491 diff changeset	1373 }
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 491 diff changeset	1374 require(T.RParen);
618 07946b379006 Refactored the way dot expressions are parsed. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 616 diff changeset	1375 set(type, begin);
492 9c208925a3d4 Added module ImportParser and new stuff from DMD2.008. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 491 diff changeset	1376 return type;
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 491 diff changeset	1377 }
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 491 diff changeset	1378
150 753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1379 /*
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1380 TemplateMixin:
151 2e959f67000b - Added code for parsing mixin expression declarations. aziz parents: 150 diff changeset	1381 mixin ( AssignExpression ) ;
150 753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1382 mixin TemplateIdentifier ;
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1383 mixin TemplateIdentifier MixinIdentifier ;
233 c2b601dcd57d - Added assert to parseDotListExpression(). aziz parents: 232 diff changeset	1384 mixin TemplateIdentifier !( TemplateArguments ) ;
c2b601dcd57d - Added assert to parseDotListExpression(). aziz parents: 232 diff changeset	1385 mixin TemplateIdentifier !( TemplateArguments ) MixinIdentifier ;
150 753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1386 */
256 8f27920ae17a - Made parseMixinDeclaration() a template. aziz parents: 255 diff changeset	1387 Class parseMixin(Class)()
150 753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1388 {
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1389 assert(token.type == T.Mixin);
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1390 nT(); // Skip mixin keyword.
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1391
256 8f27920ae17a - Made parseMixinDeclaration() a template. aziz parents: 255 diff changeset	1392 static if (is(Class == MixinDeclaration))
301 caef255a2801 - Fix in some ctors: adding only non-null members to this.children. aziz parents: 299 diff changeset	1393 {
531 315aeb3f7a9b Added method skipped() to dil.Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 530 diff changeset	1394 if (skipped(T.LParen))
151 2e959f67000b - Added code for parsing mixin expression declarations. aziz parents: 150 diff changeset	1395 {
2e959f67000b - Added code for parsing mixin expression declarations. aziz parents: 150 diff changeset	1396 auto e = parseAssignExpression();
2e959f67000b - Added code for parsing mixin expression declarations. aziz parents: 150 diff changeset	1397 require(T.RParen);
2e959f67000b - Added code for parsing mixin expression declarations. aziz parents: 150 diff changeset	1398 require(T.Semicolon);
262 0f22269e76ff - Changed some string types to Token. aziz* parents: 261 diff changeset	1399 return new MixinDeclaration(e);
151 2e959f67000b - Added code for parsing mixin expression declarations. aziz parents: 150 diff changeset	1400 }
301 caef255a2801 - Fix in some ctors: adding only non-null members to this.children. aziz parents: 299 diff changeset	1401 }
151 2e959f67000b - Added code for parsing mixin expression declarations. aziz parents: 150 diff changeset	1402
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	1403 auto begin = token;
618 07946b379006 Refactored the way dot expressions are parsed. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 616 diff changeset	1404 Expression e;
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	1405 Identifier* mixinIdent;
150 753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1406
531 315aeb3f7a9b Added method skipped() to dil.Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 530 diff changeset	1407 if (skipped(T.Dot))
618 07946b379006 Refactored the way dot expressions are parsed. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 616 diff changeset	1408 e = set(new ModuleScopeExpression(parseIdentifierExpression()), begin);
07946b379006 Refactored the way dot expressions are parsed. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 616 diff changeset	1409 else
07946b379006 Refactored the way dot expressions are parsed. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 616 diff changeset	1410 e = parseIdentifierExpression();
07946b379006 Refactored the way dot expressions are parsed. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 616 diff changeset	1411
07946b379006 Refactored the way dot expressions are parsed. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 616 diff changeset	1412 while (skipped(T.Dot))
07946b379006 Refactored the way dot expressions are parsed. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 616 diff changeset	1413 e = set(new DotExpression(e, parseIdentifierExpression()), begin);
150 753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1414
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	1415 mixinIdent = optionalIdentifier();
150 753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1416 require(T.Semicolon);
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1417
618 07946b379006 Refactored the way dot expressions are parsed. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 616 diff changeset	1418 return new Class(e, mixinIdent);
150 753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1419 }
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	1420
102 6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	1421 /+++++++++++++++++++++++++++++
161 82c5cfc7d6d3 - Started implementation of parsing statements. aziz parents: 160 diff changeset	1422 + Statement parsing methods +
82c5cfc7d6d3 - Started implementation of parsing statements. aziz parents: 160 diff changeset	1423 +++++++++++++++++++++++++++++/
82c5cfc7d6d3 - Started implementation of parsing statements. aziz parents: 160 diff changeset	1424
82c5cfc7d6d3 - Started implementation of parsing statements. aziz parents: 160 diff changeset	1425 Statements parseStatements()
82c5cfc7d6d3 - Started implementation of parsing statements. aziz parents: 160 diff changeset	1426 {
262 0f22269e76ff - Changed some string types to Token. aziz* parents: 261 diff changeset	1427 auto begin = token;
318 a1c9d93a66e3 - Added member prevToken to Parser. aziz parents: 314 diff changeset	1428 require(T.LBrace);
162 c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	1429 auto statements = new Statements();
161 82c5cfc7d6d3 - Started implementation of parsing statements. aziz parents: 160 diff changeset	1430 while (token.type != T.RBrace && token.type != T.EOF)
82c5cfc7d6d3 - Started implementation of parsing statements. aziz parents: 160 diff changeset	1431 statements ~= parseStatement();
318 a1c9d93a66e3 - Added member prevToken to Parser. aziz parents: 314 diff changeset	1432 require(T.RBrace);
262 0f22269e76ff - Changed some string types to Token. aziz* parents: 261 diff changeset	1433 return set(statements, begin);
161 82c5cfc7d6d3 - Started implementation of parsing statements. aziz parents: 160 diff changeset	1434 }
82c5cfc7d6d3 - Started implementation of parsing statements. aziz parents: 160 diff changeset	1435
82c5cfc7d6d3 - Started implementation of parsing statements. aziz parents: 160 diff changeset	1436 Statement parseStatement()
82c5cfc7d6d3 - Started implementation of parsing statements. aziz parents: 160 diff changeset	1437 {
261 966756c5d5d3 - Added begin variables and calls to set(). aziz parents: 260 diff changeset	1438 auto begin = token;
161 82c5cfc7d6d3 - Started implementation of parsing statements. aziz parents: 160 diff changeset	1439 Statement s;
188 5c6ebf9f60a9 - Added code for parsing DeclarationStatement. aziz parents: 187 diff changeset	1440 Declaration d;
508 943ecc9c133a Added isIntegralType() to Token and refactored code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 507 diff changeset	1441
943ecc9c133a Added isIntegralType() to Token and refactored code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 507 diff changeset	1442 if (token.isIntegralType)
943ecc9c133a Added isIntegralType() to Token and refactored code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 507 diff changeset	1443 {
943ecc9c133a Added isIntegralType() to Token and refactored code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 507 diff changeset	1444 d = parseVariableOrFunction();
943ecc9c133a Added isIntegralType() to Token and refactored code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 507 diff changeset	1445 goto LreturnDeclarationStatement;
943ecc9c133a Added isIntegralType() to Token and refactored code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 507 diff changeset	1446 }
943ecc9c133a Added isIntegralType() to Token and refactored code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 507 diff changeset	1447
161 82c5cfc7d6d3 - Started implementation of parsing statements. aziz parents: 160 diff changeset	1448 switch (token.type)
82c5cfc7d6d3 - Started implementation of parsing statements. aziz parents: 160 diff changeset	1449 {
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1450 case T.Align:
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	1451 uint size = parseAlignAttribute();
260 b83180748ae6 - Added method parseAlignAttribute(). aziz parents: 259 diff changeset	1452 // Restrict align attribute to structs in parsing phase.
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	1453 StructDeclaration structDecl;
260 b83180748ae6 - Added method parseAlignAttribute(). aziz parents: 259 diff changeset	1454 if (token.type == T.Struct)
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	1455 {
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	1456 auto begin2 = token;
638 7131c07997f9 Renamed parseAggregateDeclaration() to parseStructOrUnionDeclaration(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 637 diff changeset	1457 structDecl = parseStructOrUnionDeclaration().to!(StructDeclaration);
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	1458 structDecl.setAlignSize(size);
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	1459 set(structDecl, begin2);
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	1460 }
260 b83180748ae6 - Added method parseAlignAttribute(). aziz parents: 259 diff changeset	1461 else
b83180748ae6 - Added method parseAlignAttribute(). aziz parents: 259 diff changeset	1462 expected(T.Struct);
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	1463
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	1464 d = new AlignDeclaration(size, structDecl ? cast(Declaration)structDecl : new Declarations);
483 180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	1465 goto LreturnDeclarationStatement;
508 943ecc9c133a Added isIntegralType() to Token and refactored code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 507 diff changeset	1466 /+ Not applicable for statements.
943ecc9c133a Added isIntegralType() to Token and refactored code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 507 diff changeset	1467 T.Private, T.Package, T.Protected, T.Public, T.Export,
943ecc9c133a Added isIntegralType() to Token and refactored code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 507 diff changeset	1468 T.Deprecated, T.Override, T.Abstract,+/
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1469 case T.Extern,
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1470 T.Final,
191 3ce110cefbc5 - Added code for parsing AliasDeclaration and TypedefDeclaration. aziz parents: 190 diff changeset	1471 T.Const,
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1472 T.Auto:
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1473 //T.Scope
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1474 //T.Static
201 70715b9e2109 - Implemented parseAttributeStatement(). aziz parents: 200 diff changeset	1475 case_parseAttribute:
70715b9e2109 - Implemented parseAttributeStatement(). aziz parents: 200 diff changeset	1476 s = parseAttributeStatement();
261 966756c5d5d3 - Added begin variables and calls to set(). aziz parents: 260 diff changeset	1477 return s;
161 82c5cfc7d6d3 - Started implementation of parsing statements. aziz parents: 160 diff changeset	1478 case T.Identifier:
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1479 if (peekNext() == T.Colon)
161 82c5cfc7d6d3 - Started implementation of parsing statements. aziz parents: 160 diff changeset	1480 {
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	1481 auto ident = token.ident;
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	1482 nT(), nT(); // Skip Identifier :
234 5c1111dc8670 - Added method parseNoScopeOrEmptyStatement(). aziz parents: 233 diff changeset	1483 s = new LabeledStatement(ident, parseNoScopeOrEmptyStatement());
161 82c5cfc7d6d3 - Started implementation of parsing statements. aziz parents: 160 diff changeset	1484 break;
82c5cfc7d6d3 - Started implementation of parsing statements. aziz parents: 160 diff changeset	1485 }
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	1486 goto case T.Dot;
201 70715b9e2109 - Implemented parseAttributeStatement(). aziz parents: 200 diff changeset	1487 case T.Dot, T.Typeof:
214 45fc474c1678 - Changed 'failed' parameter of try_() to 'success'. aziz parents: 213 diff changeset	1488 bool success;
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	1489 d = try_(delegate {
501 949a53332c66 Fixed parsing of AutoDeclarations. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 496 diff changeset	1490 return parseVariableOrFunction(StorageClass.None,
949a53332c66 Fixed parsing of AutoDeclarations. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 496 diff changeset	1491 Protection.None,
949a53332c66 Fixed parsing of AutoDeclarations. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 496 diff changeset	1492 LinkageType.None, false, false);
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	1493 }, success
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	1494 );
214 45fc474c1678 - Changed 'failed' parameter of try_() to 'success'. aziz parents: 213 diff changeset	1495 if (success)
483 180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	1496 goto LreturnDeclarationStatement; // Declaration
201 70715b9e2109 - Implemented parseAttributeStatement(). aziz parents: 200 diff changeset	1497 else
483 180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	1498 goto case_parseExpressionStatement; // Expression
508 943ecc9c133a Added isIntegralType() to Token and refactored code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 507 diff changeset	1499
162 c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	1500 case T.If:
c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	1501 s = parseIfStatement();
c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	1502 break;
164 8ec99326752b - Implemented parseWhileStatement(). aziz parents: 163 diff changeset	1503 case T.While:
8ec99326752b - Implemented parseWhileStatement(). aziz parents: 163 diff changeset	1504 s = parseWhileStatement();
8ec99326752b - Implemented parseWhileStatement(). aziz parents: 163 diff changeset	1505 break;
165 797074d143d7 - Implemented parseDoWhileStatement(). aziz parents: 164 diff changeset	1506 case T.Do:
797074d143d7 - Implemented parseDoWhileStatement(). aziz parents: 164 diff changeset	1507 s = parseDoWhileStatement();
797074d143d7 - Implemented parseDoWhileStatement(). aziz parents: 164 diff changeset	1508 break;
216 984d48932bce - Added class EmptyStatement. aziz parents: 214 diff changeset	1509 case T.For:
984d48932bce - Added class EmptyStatement. aziz parents: 214 diff changeset	1510 s = parseForStatement();
984d48932bce - Added class EmptyStatement. aziz parents: 214 diff changeset	1511 break;
169 4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	1512 case T.Foreach, T.Foreach_reverse:
4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	1513 s = parseForeachStatement();
4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	1514 break;
170 a63696d1c474 - Implemented parseSwitchStatement(). aziz parents: 169 diff changeset	1515 case T.Switch:
a63696d1c474 - Implemented parseSwitchStatement(). aziz parents: 169 diff changeset	1516 s = parseSwitchStatement();
a63696d1c474 - Implemented parseSwitchStatement(). aziz parents: 169 diff changeset	1517 break;
171 f1fa9bbdb4cb - Implemented parseCaseStatement(). aziz parents: 170 diff changeset	1518 case T.Case:
f1fa9bbdb4cb - Implemented parseCaseStatement(). aziz parents: 170 diff changeset	1519 s = parseCaseStatement();
f1fa9bbdb4cb - Implemented parseCaseStatement(). aziz parents: 170 diff changeset	1520 break;
172 89d4519bd8a1 - Implemented parseDefaultStatement(). aziz parents: 171 diff changeset	1521 case T.Default:
89d4519bd8a1 - Implemented parseDefaultStatement(). aziz parents: 171 diff changeset	1522 s = parseDefaultStatement();
89d4519bd8a1 - Implemented parseDefaultStatement(). aziz parents: 171 diff changeset	1523 break;
173 c2714ba44350 - Implemented parseContinueStatement(). aziz parents: 172 diff changeset	1524 case T.Continue:
c2714ba44350 - Implemented parseContinueStatement(). aziz parents: 172 diff changeset	1525 s = parseContinueStatement();
c2714ba44350 - Implemented parseContinueStatement(). aziz parents: 172 diff changeset	1526 break;
174 e51c9ee66ea0 - Implemented parseBreakStatement(). aziz parents: 173 diff changeset	1527 case T.Break:
e51c9ee66ea0 - Implemented parseBreakStatement(). aziz parents: 173 diff changeset	1528 s = parseBreakStatement();
e51c9ee66ea0 - Implemented parseBreakStatement(). aziz parents: 173 diff changeset	1529 break;
175 522df6f0f230 - Implemented parseReturnStatement(). aziz parents: 174 diff changeset	1530 case T.Return:
522df6f0f230 - Implemented parseReturnStatement(). aziz parents: 174 diff changeset	1531 s = parseReturnStatement();
522df6f0f230 - Implemented parseReturnStatement(). aziz parents: 174 diff changeset	1532 break;
176 3071522c0cf0 - Implemented parseGotoStatement(). aziz parents: 175 diff changeset	1533 case T.Goto:
3071522c0cf0 - Implemented parseGotoStatement(). aziz parents: 175 diff changeset	1534 s = parseGotoStatement();
3071522c0cf0 - Implemented parseGotoStatement(). aziz parents: 175 diff changeset	1535 break;
177 504b1b2f7c93 - Implemented parseWithStatement(). aziz parents: 176 diff changeset	1536 case T.With:
504b1b2f7c93 - Implemented parseWithStatement(). aziz parents: 176 diff changeset	1537 s = parseWithStatement();
504b1b2f7c93 - Implemented parseWithStatement(). aziz parents: 176 diff changeset	1538 break;
178 62718b29679e - Implemented parseSynchronizedStatement(). aziz parents: 177 diff changeset	1539 case T.Synchronized:
62718b29679e - Implemented parseSynchronizedStatement(). aziz parents: 177 diff changeset	1540 s = parseSynchronizedStatement();
62718b29679e - Implemented parseSynchronizedStatement(). aziz parents: 177 diff changeset	1541 break;
179 507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	1542 case T.Try:
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	1543 s = parseTryStatement();
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	1544 break;
180 d5a67aa578a8 - Implemented parseThrowStatement(). aziz parents: 179 diff changeset	1545 case T.Throw:
d5a67aa578a8 - Implemented parseThrowStatement(). aziz parents: 179 diff changeset	1546 s = parseThrowStatement();
d5a67aa578a8 - Implemented parseThrowStatement(). aziz parents: 179 diff changeset	1547 break;
181 abfd51142477 - Implemented parseScopeGuardStatement(). aziz parents: 180 diff changeset	1548 case T.Scope:
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1549 if (peekNext() != T.LParen)
201 70715b9e2109 - Implemented parseAttributeStatement(). aziz parents: 200 diff changeset	1550 goto case_parseAttribute;
181 abfd51142477 - Implemented parseScopeGuardStatement(). aziz parents: 180 diff changeset	1551 s = parseScopeGuardStatement();
abfd51142477 - Implemented parseScopeGuardStatement(). aziz parents: 180 diff changeset	1552 break;
182 673b355ba0e9 - Implemented parseVolatileStatement(). aziz parents: 181 diff changeset	1553 case T.Volatile:
673b355ba0e9 - Implemented parseVolatileStatement(). aziz parents: 181 diff changeset	1554 s = parseVolatileStatement();
673b355ba0e9 - Implemented parseVolatileStatement(). aziz parents: 181 diff changeset	1555 break;
183 c9df82f6f6be - Added parseAsmStatement() stub. aziz parents: 182 diff changeset	1556 case T.Asm:
c9df82f6f6be - Added parseAsmStatement() stub. aziz parents: 182 diff changeset	1557 s = parseAsmStatement();
c9df82f6f6be - Added parseAsmStatement() stub. aziz parents: 182 diff changeset	1558 break;
184 30a4c8522b09 - Implemented parsePragmaStatement(). aziz parents: 183 diff changeset	1559 case T.Pragma:
30a4c8522b09 - Implemented parsePragmaStatement(). aziz parents: 183 diff changeset	1560 s = parsePragmaStatement();
30a4c8522b09 - Implemented parsePragmaStatement(). aziz parents: 183 diff changeset	1561 break;
185 35c93b776be0 - Added code for parsing MixinStatements. aziz parents: 184 diff changeset	1562 case T.Mixin:
246 52f4aa097865 - Fix: parse mixin as expression instead of statement when next token is T.LParen. aziz parents: 245 diff changeset	1563 if (peekNext() == T.LParen)
483 180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	1564 goto case_parseExpressionStatement; // Parse as expression.
256 8f27920ae17a - Made parseMixinDeclaration() a template. aziz parents: 255 diff changeset	1565 s = parseMixin!(MixinStatement)();
185 35c93b776be0 - Added code for parsing MixinStatements. aziz parents: 184 diff changeset	1566 break;
186 d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	1567 case T.Static:
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1568 switch (peekNext())
186 d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	1569 {
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	1570 case T.If:
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	1571 s = parseStaticIfStatement();
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	1572 break;
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	1573 case T.Assert:
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	1574 s = parseStaticAssertStatement();
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	1575 break;
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	1576 default:
201 70715b9e2109 - Implemented parseAttributeStatement(). aziz parents: 200 diff changeset	1577 goto case_parseAttribute;
186 d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	1578 }
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1579 break;
190 d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	1580 case T.Debug:
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	1581 s = parseDebugStatement();
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	1582 break;
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	1583 case T.Version:
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	1584 s = parseVersionStatement();
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	1585 break;
226 aa38e1401217 - Fixed cases T.Alias and T.Typedef. Wrong function called. aziz parents: 225 diff changeset	1586 // DeclDef
aa38e1401217 - Fixed cases T.Alias and T.Typedef. Wrong function called. aziz parents: 225 diff changeset	1587 case T.Alias, T.Typedef:
aa38e1401217 - Fixed cases T.Alias and T.Typedef. Wrong function called. aziz parents: 225 diff changeset	1588 d = parseDeclarationDefinition();
483 180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	1589 goto LreturnDeclarationStatement;
188 5c6ebf9f60a9 - Added code for parsing DeclarationStatement. aziz parents: 187 diff changeset	1590 case T.Enum:
5c6ebf9f60a9 - Added code for parsing DeclarationStatement. aziz parents: 187 diff changeset	1591 d = parseEnumDeclaration();
483 180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	1592 goto LreturnDeclarationStatement;
188 5c6ebf9f60a9 - Added code for parsing DeclarationStatement. aziz parents: 187 diff changeset	1593 case T.Class:
5c6ebf9f60a9 - Added code for parsing DeclarationStatement. aziz parents: 187 diff changeset	1594 d = parseClassDeclaration();
483 180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	1595 goto LreturnDeclarationStatement;
188 5c6ebf9f60a9 - Added code for parsing DeclarationStatement. aziz parents: 187 diff changeset	1596 case T.Interface:
5c6ebf9f60a9 - Added code for parsing DeclarationStatement. aziz parents: 187 diff changeset	1597 d = parseInterfaceDeclaration();
483 180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	1598 goto LreturnDeclarationStatement;
188 5c6ebf9f60a9 - Added code for parsing DeclarationStatement. aziz parents: 187 diff changeset	1599 case T.Struct, T.Union:
638 7131c07997f9 Renamed parseAggregateDeclaration() to parseStructOrUnionDeclaration(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 637 diff changeset	1600 d = parseStructOrUnionDeclaration();
483 180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	1601 // goto LreturnDeclarationStatement;
180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	1602 LreturnDeclarationStatement:
261 966756c5d5d3 - Added begin variables and calls to set(). aziz parents: 260 diff changeset	1603 set(d, begin);
188 5c6ebf9f60a9 - Added code for parsing DeclarationStatement. aziz parents: 187 diff changeset	1604 s = new DeclarationStatement(d);
5c6ebf9f60a9 - Added code for parsing DeclarationStatement. aziz parents: 187 diff changeset	1605 break;
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	1606 case T.LBrace:
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	1607 s = parseScopeStatement();
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	1608 break;
216 984d48932bce - Added class EmptyStatement. aziz parents: 214 diff changeset	1609 case T.Semicolon:
231 6846138a0e24 - Fixed parseEnumDeclaration(). aziz parents: 230 diff changeset	1610 nT();
216 984d48932bce - Added class EmptyStatement. aziz parents: 214 diff changeset	1611 s = new EmptyStatement();
984d48932bce - Added class EmptyStatement. aziz parents: 214 diff changeset	1612 break;
400 a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1613 /+
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1614 Parse ExpressionStatement:
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1615 +/
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1616 // Tokens that start a PrimaryExpression.
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1617 // case T.Identifier, T.Dot, T.Typeof:
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1618 case T.This:
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1619 case T.Super:
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1620 case T.Null:
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1621 case T.True, T.False:
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1622 // case T.Dollar:
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1623 case T.Int32, T.Int64, T.Uint32, T.Uint64:
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1624 case T.Float32, T.Float64, T.Float80,
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1625 T.Imaginary32, T.Imaginary64, T.Imaginary80:
507 996041463028 Removed TOK.WCharLiteral and TOK.DCharLiteral. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 505 diff changeset	1626 case T.CharLiteral:
400 a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1627 case T.String:
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1628 case T.LBracket:
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1629 // case T.LBrace:
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1630 case T.Function, T.Delegate:
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1631 case T.Assert:
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1632 // case T.Mixin:
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1633 case T.Import:
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1634 case T.Typeid:
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1635 case T.Is:
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1636 case T.LParen:
486 bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	1637 case T.Traits: // D2.0
400 a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1638 // Tokens that can start a UnaryExpression:
508 943ecc9c133a Added isIntegralType() to Token and refactored code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 507 diff changeset	1639 case T.AndBinary, T.PlusPlus, T.MinusMinus, T.Mul, T.Minus,
943ecc9c133a Added isIntegralType() to Token and refactored code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 507 diff changeset	1640 T.Plus, T.Not, T.Tilde, T.New, T.Delete, T.Cast:
483 180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	1641 case_parseExpressionStatement:
400 a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1642 s = new ExpressionStatement(parseExpression());
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1643 require(T.Semicolon);
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1644 break;
161 82c5cfc7d6d3 - Started implementation of parsing statements. aziz parents: 160 diff changeset	1645 default:
400 a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1646 if (token.isSpecialToken)
483 180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	1647 goto case_parseExpressionStatement;
400 a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1648
486 bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	1649 if (token.type != T.Dollar)
bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	1650 // Assert that this isn't a valid expression.
496 5a607597dc22 Improved error recovery in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 495 diff changeset	1651 assert(delegate bool(){
486 bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	1652 bool success;
bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	1653 auto expression = try_(&parseExpression, success);
bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	1654 return success;
bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	1655 }() == false, "Didn't expect valid expression."
bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	1656 );
400 a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1657
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 399 diff changeset	1658 // Report error: it's an illegal statement.
496 5a607597dc22 Improved error recovery in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 495 diff changeset	1659 s = new IllegalStatement();
5a607597dc22 Improved error recovery in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 495 diff changeset	1660 // Skip to next valid token.
5a607597dc22 Improved error recovery in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 495 diff changeset	1661 do
5a607597dc22 Improved error recovery in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 495 diff changeset	1662 nT();
5a607597dc22 Improved error recovery in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 495 diff changeset	1663 while (!token.isStatementStart &&
5a607597dc22 Improved error recovery in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 495 diff changeset	1664 token.type != T.RBrace &&
5a607597dc22 Improved error recovery in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 495 diff changeset	1665 token.type != T.EOF)
5a607597dc22 Improved error recovery in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 495 diff changeset	1666 auto text = Token.textSpan(begin, this.prevToken);
616 506ce60760d8 Fixed some error messages. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 608 diff changeset	1667 error(begin, MSG.IllegalStatement, text);
161 82c5cfc7d6d3 - Started implementation of parsing statements. aziz parents: 160 diff changeset	1668 }
205 e5a4f88982d1 - Added assert at the end of parseStatement(). aziz parents: 204 diff changeset	1669 assert(s !is null);
261 966756c5d5d3 - Added begin variables and calls to set(). aziz parents: 260 diff changeset	1670 set(s, begin);
161 82c5cfc7d6d3 - Started implementation of parsing statements. aziz parents: 160 diff changeset	1671 return s;
82c5cfc7d6d3 - Started implementation of parsing statements. aziz parents: 160 diff changeset	1672 }
82c5cfc7d6d3 - Started implementation of parsing statements. aziz parents: 160 diff changeset	1673
486 bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	1674 /++
162 c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	1675 ScopeStatement:
219 0d14a09227a4 - Simplified parseScopeStatement(). aziz parents: 218 diff changeset	1676 NoScopeStatement
162 c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	1677 +/
164 8ec99326752b - Implemented parseWhileStatement(). aziz parents: 163 diff changeset	1678 Statement parseScopeStatement()
162 c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	1679 {
219 0d14a09227a4 - Simplified parseScopeStatement(). aziz parents: 218 diff changeset	1680 return new ScopeStatement(parseNoScopeStatement());
162 c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	1681 }
c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	1682
486 bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	1683 /++
166 56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1684 NoScopeStatement:
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1685 NonEmptyStatement
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1686 BlockStatement
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1687 BlockStatement:
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1688 { }
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1689 { StatementList }
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1690 +/
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1691 Statement parseNoScopeStatement()
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1692 {
486 bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	1693 auto begin = token;
166 56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1694 Statement s;
531 315aeb3f7a9b Added method skipped() to dil.Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 530 diff changeset	1695 if (skipped(T.LBrace))
166 56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1696 {
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1697 auto ss = new Statements();
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1698 while (token.type != T.RBrace && token.type != T.EOF)
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1699 ss ~= parseStatement();
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1700 require(T.RBrace);
486 bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	1701 s = set(ss, begin);
166 56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1702 }
219 0d14a09227a4 - Simplified parseScopeStatement(). aziz parents: 218 diff changeset	1703 else if (token.type == T.Semicolon)
0d14a09227a4 - Simplified parseScopeStatement(). aziz parents: 218 diff changeset	1704 {
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	1705 error(token, MSG.ExpectedNonEmptyStatement);
219 0d14a09227a4 - Simplified parseScopeStatement(). aziz parents: 218 diff changeset	1706 nT();
486 bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	1707 s = set(new EmptyStatement(), begin);
219 0d14a09227a4 - Simplified parseScopeStatement(). aziz parents: 218 diff changeset	1708 }
166 56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1709 else
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1710 s = parseStatement();
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1711 return s;
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1712 }
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1713
486 bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	1714 /++
234 5c1111dc8670 - Added method parseNoScopeOrEmptyStatement(). aziz parents: 233 diff changeset	1715 NoScopeOrEmptyStatement:
5c1111dc8670 - Added method parseNoScopeOrEmptyStatement(). aziz parents: 233 diff changeset	1716 ;
5c1111dc8670 - Added method parseNoScopeOrEmptyStatement(). aziz parents: 233 diff changeset	1717 NoScopeStatement
5c1111dc8670 - Added method parseNoScopeOrEmptyStatement(). aziz parents: 233 diff changeset	1718 +/
5c1111dc8670 - Added method parseNoScopeOrEmptyStatement(). aziz parents: 233 diff changeset	1719 Statement parseNoScopeOrEmptyStatement()
5c1111dc8670 - Added method parseNoScopeOrEmptyStatement(). aziz parents: 233 diff changeset	1720 {
531 315aeb3f7a9b Added method skipped() to dil.Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 530 diff changeset	1721 if (skipped(T.Semicolon))
315aeb3f7a9b Added method skipped() to dil.Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 530 diff changeset	1722 return set(new EmptyStatement(), this.prevToken);
234 5c1111dc8670 - Added method parseNoScopeOrEmptyStatement(). aziz parents: 233 diff changeset	1723 else
5c1111dc8670 - Added method parseNoScopeOrEmptyStatement(). aziz parents: 233 diff changeset	1724 return parseNoScopeStatement();
5c1111dc8670 - Added method parseNoScopeOrEmptyStatement(). aziz parents: 233 diff changeset	1725 }
5c1111dc8670 - Added method parseNoScopeOrEmptyStatement(). aziz parents: 233 diff changeset	1726
201 70715b9e2109 - Implemented parseAttributeStatement(). aziz parents: 200 diff changeset	1727 Statement parseAttributeStatement()
70715b9e2109 - Implemented parseAttributeStatement(). aziz parents: 200 diff changeset	1728 {
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	1729 StorageClass stc, stc_tmp;
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	1730 LinkageType prev_linkageType;
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	1731
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	1732 // Nested function.
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	1733 Declaration parse()
201 70715b9e2109 - Implemented parseAttributeStatement(). aziz parents: 200 diff changeset	1734 {
261 966756c5d5d3 - Added begin variables and calls to set(). aziz parents: 260 diff changeset	1735 auto begin = token;
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	1736 Declaration d;
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1737 switch (token.type)
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1738 {
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1739 case T.Extern:
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	1740 if (peekNext() != T.LParen)
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1741 {
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	1742 stc_tmp = StorageClass.Extern;
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	1743 goto Lcommon;
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1744 }
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	1745
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	1746 nT();
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	1747 auto linkageType = parseLinkageType();
496 5a607597dc22 Improved error recovery in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 495 diff changeset	1748 checkLinkageType(prev_linkageType, linkageType, begin);
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	1749
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	1750 d = new LinkageDeclaration(linkageType, parse());
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1751 break;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1752 case T.Static:
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	1753 stc_tmp = StorageClass.Static;
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1754 goto Lcommon;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1755 case T.Final:
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	1756 stc_tmp = StorageClass.Final;
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1757 goto Lcommon;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1758 case T.Const:
270 764eccdf619d - Fix in parseAttributeStatement(): added checks for T.LParen after const/invariant. aziz parents: 269 diff changeset	1759 version(D2)
764eccdf619d - Fix in parseAttributeStatement(): added checks for T.LParen after const/invariant. aziz parents: 269 diff changeset	1760 {
764eccdf619d - Fix in parseAttributeStatement(): added checks for T.LParen after const/invariant. aziz parents: 269 diff changeset	1761 if (peekNext() == T.LParen)
764eccdf619d - Fix in parseAttributeStatement(): added checks for T.LParen after const/invariant. aziz parents: 269 diff changeset	1762 goto case_Declaration;
764eccdf619d - Fix in parseAttributeStatement(): added checks for T.LParen after const/invariant. aziz parents: 269 diff changeset	1763 }
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	1764 stc_tmp = StorageClass.Const;
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1765 goto Lcommon;
270 764eccdf619d - Fix in parseAttributeStatement(): added checks for T.LParen after const/invariant. aziz parents: 269 diff changeset	1766 version(D2)
764eccdf619d - Fix in parseAttributeStatement(): added checks for T.LParen after const/invariant. aziz parents: 269 diff changeset	1767 {
764eccdf619d - Fix in parseAttributeStatement(): added checks for T.LParen after const/invariant. aziz parents: 269 diff changeset	1768 case T.Invariant: // D 2.0
764eccdf619d - Fix in parseAttributeStatement(): added checks for T.LParen after const/invariant. aziz parents: 269 diff changeset	1769 if (peekNext() == T.LParen)
764eccdf619d - Fix in parseAttributeStatement(): added checks for T.LParen after const/invariant. aziz parents: 269 diff changeset	1770 goto case_Declaration;
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	1771 stc_tmp = StorageClass.Invariant;
270 764eccdf619d - Fix in parseAttributeStatement(): added checks for T.LParen after const/invariant. aziz parents: 269 diff changeset	1772 goto Lcommon;
764eccdf619d - Fix in parseAttributeStatement(): added checks for T.LParen after const/invariant. aziz parents: 269 diff changeset	1773 }
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1774 case T.Auto:
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	1775 stc_tmp = StorageClass.Auto;
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1776 goto Lcommon;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1777 case T.Scope:
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	1778 stc_tmp = StorageClass.Scope;
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1779 goto Lcommon;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1780 Lcommon:
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	1781 // Issue error if redundant.
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	1782 if (stc & stc_tmp)
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	1783 error(MID.RedundantStorageClass, token.srcText);
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	1784 else
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	1785 stc \|= stc_tmp;
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	1786
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1787 nT();
650 eb490ba8dba0 Made AttributeDeclaration abstract. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 646 diff changeset	1788 d = new StorageClassDeclaration(stc_tmp, parse());
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1789 break;
239 7911f6a92e6e - Added 'new' and 'delete' declarations to Token and uncommented next and prev members. Added HEAD to TOK. aziz parents: 238 diff changeset	1790 // TODO: allow "scope class", "abstract scope class" in function bodies?
7911f6a92e6e - Added 'new' and 'delete' declarations to Token and uncommented next and prev members. Added HEAD to TOK. aziz parents: 238 diff changeset	1791 //case T.Class:
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1792 default:
270 764eccdf619d - Fix in parseAttributeStatement(): added checks for T.LParen after const/invariant. aziz parents: 269 diff changeset	1793 case_Declaration:
501 949a53332c66 Fixed parsing of AutoDeclarations. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 496 diff changeset	1794 return parseVariableOrFunction(stc, Protection.None, prev_linkageType, true);
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1795 }
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	1796 return set(d, begin);
201 70715b9e2109 - Implemented parseAttributeStatement(). aziz parents: 200 diff changeset	1797 }
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	1798 return new DeclarationStatement(parse());
201 70715b9e2109 - Implemented parseAttributeStatement(). aziz parents: 200 diff changeset	1799 }
70715b9e2109 - Implemented parseAttributeStatement(). aziz parents: 200 diff changeset	1800
162 c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	1801 Statement parseIfStatement()
c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	1802 {
c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	1803 assert(token.type == T.If);
c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	1804 nT();
c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	1805
283 df657dd98ffa - Fix: added member type to VariableDeclaration. aziz parents: 282 diff changeset	1806 Statement variable;
162 c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	1807 Expression condition;
c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	1808 Statement ifBody, elseBody;
c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	1809
c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	1810 require(T.LParen);
283 df657dd98ffa - Fix: added member type to VariableDeclaration. aziz parents: 282 diff changeset	1811
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	1812 Identifier* ident;
484 265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	1813 auto begin = token; // For start of AutoDeclaration or normal Declaration.
162 c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	1814 // auto Identifier = Expression
531 315aeb3f7a9b Added method skipped() to dil.Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 530 diff changeset	1815 if (skipped(T.Auto))
162 c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	1816 {
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	1817 ident = requireIdentifier(MSG.ExpectedVariableName);
162 c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	1818 require(T.Assign);
283 df657dd98ffa - Fix: added member type to VariableDeclaration. aziz parents: 282 diff changeset	1819 auto init = parseExpression();
673 64fec49651cf Renamed VariableDeclaration to VariablesDeclaration. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 671 diff changeset	1820 auto v = new VariablesDeclaration(null, [ident], [init]);
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	1821 set(v, begin.nextNWS);
650 eb490ba8dba0 Made AttributeDeclaration abstract. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 646 diff changeset	1822 auto d = new StorageClassDeclaration(StorageClass.Auto, v);
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	1823 set(d, begin);
b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	1824 variable = new DeclarationStatement(d);
484 265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	1825 set(variable, begin);
162 c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	1826 }
c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	1827 else
c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	1828 {
c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	1829 // Declarator = Expression
237 805796880adb - Fix in parseIfStatement(): require(T.Assign) must be encompassed by a try_() call. aziz parents: 236 diff changeset	1830 Type parseDeclaratorAssign()
162 c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	1831 {
237 805796880adb - Fix in parseIfStatement(): require(T.Assign) must be encompassed by a try_() call. aziz parents: 236 diff changeset	1832 auto type = parseDeclarator(ident);
162 c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	1833 require(T.Assign);
237 805796880adb - Fix in parseIfStatement(): require(T.Assign) must be encompassed by a try_() call. aziz parents: 236 diff changeset	1834 return type;
162 c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	1835 }
237 805796880adb - Fix in parseIfStatement(): require(T.Assign) must be encompassed by a try_() call. aziz parents: 236 diff changeset	1836 bool success;
423 6057113f9a44 Refactored Parser.try_(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 422 diff changeset	1837 auto type = try_(&parseDeclaratorAssign, success);
283 df657dd98ffa - Fix: added member type to VariableDeclaration. aziz parents: 282 diff changeset	1838 if (success)
163 f27a98bb17c7 - Fix: when parsing Declarator fails, type and ident is set to null. aziz parents: 162 diff changeset	1839 {
283 df657dd98ffa - Fix: added member type to VariableDeclaration. aziz parents: 282 diff changeset	1840 auto init = parseExpression();
673 64fec49651cf Renamed VariableDeclaration to VariablesDeclaration. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 671 diff changeset	1841 auto v = new VariablesDeclaration(type, [ident], [init]);
484 265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	1842 set(v, begin);
265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	1843 variable = new DeclarationStatement(v);
265c0b655f18 Added more calls to set(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 483 diff changeset	1844 set(variable, begin);
163 f27a98bb17c7 - Fix: when parsing Declarator fails, type and ident is set to null. aziz parents: 162 diff changeset	1845 }
283 df657dd98ffa - Fix: added member type to VariableDeclaration. aziz parents: 282 diff changeset	1846 else
df657dd98ffa - Fix: added member type to VariableDeclaration. aziz parents: 282 diff changeset	1847 condition = parseExpression();
162 c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	1848 }
c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	1849 require(T.RParen);
164 8ec99326752b - Implemented parseWhileStatement(). aziz parents: 163 diff changeset	1850 ifBody = parseScopeStatement();
531 315aeb3f7a9b Added method skipped() to dil.Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 530 diff changeset	1851 if (skipped(T.Else))
164 8ec99326752b - Implemented parseWhileStatement(). aziz parents: 163 diff changeset	1852 elseBody = parseScopeStatement();
283 df657dd98ffa - Fix: added member type to VariableDeclaration. aziz parents: 282 diff changeset	1853 return new IfStatement(variable, condition, ifBody, elseBody);
162 c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	1854 }
c7b250662c74 - Added class ScopeStatement. aziz parents: 161 diff changeset	1855
164 8ec99326752b - Implemented parseWhileStatement(). aziz parents: 163 diff changeset	1856 Statement parseWhileStatement()
8ec99326752b - Implemented parseWhileStatement(). aziz parents: 163 diff changeset	1857 {
8ec99326752b - Implemented parseWhileStatement(). aziz parents: 163 diff changeset	1858 assert(token.type == T.While);
8ec99326752b - Implemented parseWhileStatement(). aziz parents: 163 diff changeset	1859 nT();
166 56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1860 require(T.LParen);
164 8ec99326752b - Implemented parseWhileStatement(). aziz parents: 163 diff changeset	1861 auto condition = parseExpression();
166 56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1862 require(T.RParen);
164 8ec99326752b - Implemented parseWhileStatement(). aziz parents: 163 diff changeset	1863 return new WhileStatement(condition, parseScopeStatement());
8ec99326752b - Implemented parseWhileStatement(). aziz parents: 163 diff changeset	1864 }
8ec99326752b - Implemented parseWhileStatement(). aziz parents: 163 diff changeset	1865
165 797074d143d7 - Implemented parseDoWhileStatement(). aziz parents: 164 diff changeset	1866 Statement parseDoWhileStatement()
797074d143d7 - Implemented parseDoWhileStatement(). aziz parents: 164 diff changeset	1867 {
797074d143d7 - Implemented parseDoWhileStatement(). aziz parents: 164 diff changeset	1868 assert(token.type == T.Do);
797074d143d7 - Implemented parseDoWhileStatement(). aziz parents: 164 diff changeset	1869 nT();
797074d143d7 - Implemented parseDoWhileStatement(). aziz parents: 164 diff changeset	1870 auto doBody = parseScopeStatement();
797074d143d7 - Implemented parseDoWhileStatement(). aziz parents: 164 diff changeset	1871 require(T.While);
166 56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1872 require(T.LParen);
165 797074d143d7 - Implemented parseDoWhileStatement(). aziz parents: 164 diff changeset	1873 auto condition = parseExpression();
166 56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1874 require(T.RParen);
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1875 return new DoWhileStatement(condition, doBody);
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1876 }
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1877
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1878 Statement parseForStatement()
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1879 {
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1880 assert(token.type == T.For);
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1881 nT();
165 797074d143d7 - Implemented parseDoWhileStatement(). aziz parents: 164 diff changeset	1882 require(T.LParen);
166 56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1883
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1884 Statement init, forBody;
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1885 Expression condition, increment;
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1886
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1887 if (token.type != T.Semicolon)
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1888 init = parseNoScopeStatement();
230 8f1790d16753 - Fix: added missing call to parseDeclaratorSuffx() in parseDeclaration. aziz parents: 229 diff changeset	1889 else
8f1790d16753 - Fix: added missing call to parseDeclaratorSuffx() in parseDeclaration. aziz parents: 229 diff changeset	1890 nT(); // Skip ;
166 56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1891 if (token.type != T.Semicolon)
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1892 condition = parseExpression();
168 fbbb2434bf6b - Simplified parseForStatement(). aziz parents: 167 diff changeset	1893 require(T.Semicolon);
166 56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1894 if (token.type != T.RParen)
56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1895 increment = parseExpression();
168 fbbb2434bf6b - Simplified parseForStatement(). aziz parents: 167 diff changeset	1896 require(T.RParen);
167 141b908e32b6 - Fix: forgot parsing forBody. aziz parents: 166 diff changeset	1897 forBody = parseScopeStatement();
166 56334292a29e - Implemented parseForStatement(). aziz parents: 165 diff changeset	1898 return new ForStatement(init, condition, increment, forBody);
165 797074d143d7 - Implemented parseDoWhileStatement(). aziz parents: 164 diff changeset	1899 }
797074d143d7 - Implemented parseDoWhileStatement(). aziz parents: 164 diff changeset	1900
169 4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	1901 Statement parseForeachStatement()
4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	1902 {
4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	1903 assert(token.type == T.Foreach \|\| token.type == T.Foreach_reverse);
4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	1904 TOK tok = token.type;
4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	1905 nT();
4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	1906
257 6c58366ba1eb - Fix: need to allocate Parameters. aziz parents: 256 diff changeset	1907 auto params = new Parameters;
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	1908 Expression e; // Aggregate or LwrExpression
169 4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	1909
4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	1910 require(T.LParen);
4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	1911 while (1)
4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	1912 {
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	1913 auto paramBegin = token;
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	1914 StorageClass stc;
169 4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	1915 Type type;
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	1916 Identifier* ident;
169 4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	1917
4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	1918 switch (token.type)
4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	1919 {
236 e961d1b957c3 - Fix in parseForeachStatement(): added T.Inout to case T.Ref; removed break statement. aziz parents: 235 diff changeset	1920 case T.Ref, T.Inout:
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	1921 stc = StorageClass.Ref;
169 4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	1922 nT();
236 e961d1b957c3 - Fix in parseForeachStatement(): added T.Inout to case T.Ref; removed break statement. aziz parents: 235 diff changeset	1923 // fall through
169 4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	1924 case T.Identifier:
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1925 auto next = peekNext();
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	1926 if (next == T.Comma \|\| next == T.Semicolon \|\| next == T.RParen)
169 4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	1927 {
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	1928 ident = requireIdentifier(MSG.ExpectedVariableName);
169 4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	1929 break;
4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	1930 }
4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	1931 // fall through
4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	1932 default:
4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	1933 type = parseDeclarator(ident);
4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	1934 }
4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	1935
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	1936 params ~= set(new Parameter(stc, type, ident, null), paramBegin);
169 4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	1937
4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	1938 if (token.type != T.Comma)
4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	1939 break;
4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	1940 nT();
4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	1941 }
4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	1942 require(T.Semicolon);
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	1943 e = parseExpression();
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	1944 version(D2)
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	1945 { //Foreach (ForeachType; LwrExpression .. UprExpression ) ScopeStatement
531 315aeb3f7a9b Added method skipped() to dil.Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 530 diff changeset	1946 if (skipped(T.Slice))
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	1947 {
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	1948 // if (params.length != 1)
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	1949 // error(MID.XYZ); // TODO: issue error msg
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	1950 auto upper = parseExpression();
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	1951 require(T.RParen);
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	1952 auto forBody = parseScopeStatement();
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	1953 return new ForeachRangeStatement(tok, params, e, upper, forBody);
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	1954 }
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	1955 }
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	1956 // Foreach (ForeachTypeList; Aggregate) ScopeStatement
169 4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	1957 require(T.RParen);
4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	1958 auto forBody = parseScopeStatement();
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	1959 return new ForeachStatement(tok, params, e, forBody);
169 4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	1960 }
4666a05dfacf - Implemented parseForeachStatement(). aziz parents: 168 diff changeset	1961
170 a63696d1c474 - Implemented parseSwitchStatement(). aziz parents: 169 diff changeset	1962 Statement parseSwitchStatement()
a63696d1c474 - Implemented parseSwitchStatement(). aziz parents: 169 diff changeset	1963 {
a63696d1c474 - Implemented parseSwitchStatement(). aziz parents: 169 diff changeset	1964 assert(token.type == T.Switch);
a63696d1c474 - Implemented parseSwitchStatement(). aziz parents: 169 diff changeset	1965 nT();
a63696d1c474 - Implemented parseSwitchStatement(). aziz parents: 169 diff changeset	1966 require(T.LParen);
a63696d1c474 - Implemented parseSwitchStatement(). aziz parents: 169 diff changeset	1967 auto condition = parseExpression();
a63696d1c474 - Implemented parseSwitchStatement(). aziz parents: 169 diff changeset	1968 require(T.RParen);
a63696d1c474 - Implemented parseSwitchStatement(). aziz parents: 169 diff changeset	1969 auto switchBody = parseScopeStatement();
a63696d1c474 - Implemented parseSwitchStatement(). aziz parents: 169 diff changeset	1970 return new SwitchStatement(condition, switchBody);
a63696d1c474 - Implemented parseSwitchStatement(). aziz parents: 169 diff changeset	1971 }
a63696d1c474 - Implemented parseSwitchStatement(). aziz parents: 169 diff changeset	1972
486 bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	1973 /++
bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	1974 Helper function for parsing the body of
bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	1975 a default or case statement.
bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	1976 +/
bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	1977 Statement parseCaseOrDefaultBody()
220 0c647e319b8e - Removed assert from parseStatement(). aziz parents: 219 diff changeset	1978 {
0c647e319b8e - Removed assert from parseStatement(). aziz parents: 219 diff changeset	1979 // This function is similar to parseNoScopeStatement()
486 bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	1980 auto begin = token;
224 f838a37a25bd - Fixed parseCaseDefaultBody(). aziz parents: 223 diff changeset	1981 auto s = new Statements();
f838a37a25bd - Fixed parseCaseDefaultBody(). aziz parents: 223 diff changeset	1982 while (token.type != T.Case &&
486 bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	1983 token.type != T.Default &&
bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	1984 token.type != T.RBrace &&
bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	1985 token.type != T.EOF)
224 f838a37a25bd - Fixed parseCaseDefaultBody(). aziz parents: 223 diff changeset	1986 s ~= parseStatement();
486 bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	1987 return set(new ScopeStatement(s), begin);
220 0c647e319b8e - Removed assert from parseStatement(). aziz parents: 219 diff changeset	1988 }
0c647e319b8e - Removed assert from parseStatement(). aziz parents: 219 diff changeset	1989
171 f1fa9bbdb4cb - Implemented parseCaseStatement(). aziz parents: 170 diff changeset	1990 Statement parseCaseStatement()
f1fa9bbdb4cb - Implemented parseCaseStatement(). aziz parents: 170 diff changeset	1991 {
f1fa9bbdb4cb - Implemented parseCaseStatement(). aziz parents: 170 diff changeset	1992 assert(token.type == T.Case);
489 a7291d3ee9d7 Refactored classes that inherit from Node. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 488 diff changeset	1993 nT();
a7291d3ee9d7 Refactored classes that inherit from Node. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 488 diff changeset	1994 auto values = parseExpressionList();
171 f1fa9bbdb4cb - Implemented parseCaseStatement(). aziz parents: 170 diff changeset	1995 require(T.Colon);
486 bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	1996 auto caseBody = parseCaseOrDefaultBody();
171 f1fa9bbdb4cb - Implemented parseCaseStatement(). aziz parents: 170 diff changeset	1997 return new CaseStatement(values, caseBody);
f1fa9bbdb4cb - Implemented parseCaseStatement(). aziz parents: 170 diff changeset	1998 }
f1fa9bbdb4cb - Implemented parseCaseStatement(). aziz parents: 170 diff changeset	1999
172 89d4519bd8a1 - Implemented parseDefaultStatement(). aziz parents: 171 diff changeset	2000 Statement parseDefaultStatement()
89d4519bd8a1 - Implemented parseDefaultStatement(). aziz parents: 171 diff changeset	2001 {
89d4519bd8a1 - Implemented parseDefaultStatement(). aziz parents: 171 diff changeset	2002 assert(token.type == T.Default);
89d4519bd8a1 - Implemented parseDefaultStatement(). aziz parents: 171 diff changeset	2003 nT();
89d4519bd8a1 - Implemented parseDefaultStatement(). aziz parents: 171 diff changeset	2004 require(T.Colon);
486 bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	2005 auto defaultBody = parseCaseOrDefaultBody();
bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	2006 return new DefaultStatement(defaultBody);
172 89d4519bd8a1 - Implemented parseDefaultStatement(). aziz parents: 171 diff changeset	2007 }
89d4519bd8a1 - Implemented parseDefaultStatement(). aziz parents: 171 diff changeset	2008
173 c2714ba44350 - Implemented parseContinueStatement(). aziz parents: 172 diff changeset	2009 Statement parseContinueStatement()
c2714ba44350 - Implemented parseContinueStatement(). aziz parents: 172 diff changeset	2010 {
c2714ba44350 - Implemented parseContinueStatement(). aziz parents: 172 diff changeset	2011 assert(token.type == T.Continue);
c2714ba44350 - Implemented parseContinueStatement(). aziz parents: 172 diff changeset	2012 nT();
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	2013 auto ident = optionalIdentifier();
173 c2714ba44350 - Implemented parseContinueStatement(). aziz parents: 172 diff changeset	2014 require(T.Semicolon);
c2714ba44350 - Implemented parseContinueStatement(). aziz parents: 172 diff changeset	2015 return new ContinueStatement(ident);
c2714ba44350 - Implemented parseContinueStatement(). aziz parents: 172 diff changeset	2016 }
c2714ba44350 - Implemented parseContinueStatement(). aziz parents: 172 diff changeset	2017
174 e51c9ee66ea0 - Implemented parseBreakStatement(). aziz parents: 173 diff changeset	2018 Statement parseBreakStatement()
e51c9ee66ea0 - Implemented parseBreakStatement(). aziz parents: 173 diff changeset	2019 {
e51c9ee66ea0 - Implemented parseBreakStatement(). aziz parents: 173 diff changeset	2020 assert(token.type == T.Break);
e51c9ee66ea0 - Implemented parseBreakStatement(). aziz parents: 173 diff changeset	2021 nT();
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	2022 auto ident = optionalIdentifier();
555 d9e328c3bab9 Fixed infinite loop in dil.Parser.parseMixin(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 539 diff changeset	2023 require(T.Semicolon);
174 e51c9ee66ea0 - Implemented parseBreakStatement(). aziz parents: 173 diff changeset	2024 return new BreakStatement(ident);
e51c9ee66ea0 - Implemented parseBreakStatement(). aziz parents: 173 diff changeset	2025 }
e51c9ee66ea0 - Implemented parseBreakStatement(). aziz parents: 173 diff changeset	2026
175 522df6f0f230 - Implemented parseReturnStatement(). aziz parents: 174 diff changeset	2027 Statement parseReturnStatement()
522df6f0f230 - Implemented parseReturnStatement(). aziz parents: 174 diff changeset	2028 {
522df6f0f230 - Implemented parseReturnStatement(). aziz parents: 174 diff changeset	2029 assert(token.type == T.Return);
522df6f0f230 - Implemented parseReturnStatement(). aziz parents: 174 diff changeset	2030 nT();
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	2031 Expression expr;
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	2032 if (token.type != T.Semicolon)
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	2033 expr = parseExpression();
175 522df6f0f230 - Implemented parseReturnStatement(). aziz parents: 174 diff changeset	2034 require(T.Semicolon);
522df6f0f230 - Implemented parseReturnStatement(). aziz parents: 174 diff changeset	2035 return new ReturnStatement(expr);
522df6f0f230 - Implemented parseReturnStatement(). aziz parents: 174 diff changeset	2036 }
522df6f0f230 - Implemented parseReturnStatement(). aziz parents: 174 diff changeset	2037
176 3071522c0cf0 - Implemented parseGotoStatement(). aziz parents: 175 diff changeset	2038 Statement parseGotoStatement()
3071522c0cf0 - Implemented parseGotoStatement(). aziz parents: 175 diff changeset	2039 {
3071522c0cf0 - Implemented parseGotoStatement(). aziz parents: 175 diff changeset	2040 assert(token.type == T.Goto);
3071522c0cf0 - Implemented parseGotoStatement(). aziz parents: 175 diff changeset	2041 nT();
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	2042 Identifier* ident;
176 3071522c0cf0 - Implemented parseGotoStatement(). aziz parents: 175 diff changeset	2043 Expression caseExpr;
3071522c0cf0 - Implemented parseGotoStatement(). aziz parents: 175 diff changeset	2044 switch (token.type)
3071522c0cf0 - Implemented parseGotoStatement(). aziz parents: 175 diff changeset	2045 {
3071522c0cf0 - Implemented parseGotoStatement(). aziz parents: 175 diff changeset	2046 case T.Case:
3071522c0cf0 - Implemented parseGotoStatement(). aziz parents: 175 diff changeset	2047 nT();
3071522c0cf0 - Implemented parseGotoStatement(). aziz parents: 175 diff changeset	2048 if (token.type == T.Semicolon)
3071522c0cf0 - Implemented parseGotoStatement(). aziz parents: 175 diff changeset	2049 break;
3071522c0cf0 - Implemented parseGotoStatement(). aziz parents: 175 diff changeset	2050 caseExpr = parseExpression();
3071522c0cf0 - Implemented parseGotoStatement(). aziz parents: 175 diff changeset	2051 break;
3071522c0cf0 - Implemented parseGotoStatement(). aziz parents: 175 diff changeset	2052 case T.Default:
3071522c0cf0 - Implemented parseGotoStatement(). aziz parents: 175 diff changeset	2053 nT();
3071522c0cf0 - Implemented parseGotoStatement(). aziz parents: 175 diff changeset	2054 break;
3071522c0cf0 - Implemented parseGotoStatement(). aziz parents: 175 diff changeset	2055 default:
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	2056 ident = requireIdentifier(MSG.ExpectedAnIdentifier);
176 3071522c0cf0 - Implemented parseGotoStatement(). aziz parents: 175 diff changeset	2057 }
3071522c0cf0 - Implemented parseGotoStatement(). aziz parents: 175 diff changeset	2058 require(T.Semicolon);
3071522c0cf0 - Implemented parseGotoStatement(). aziz parents: 175 diff changeset	2059 return new GotoStatement(ident, caseExpr);
3071522c0cf0 - Implemented parseGotoStatement(). aziz parents: 175 diff changeset	2060 }
3071522c0cf0 - Implemented parseGotoStatement(). aziz parents: 175 diff changeset	2061
177 504b1b2f7c93 - Implemented parseWithStatement(). aziz parents: 176 diff changeset	2062 Statement parseWithStatement()
504b1b2f7c93 - Implemented parseWithStatement(). aziz parents: 176 diff changeset	2063 {
504b1b2f7c93 - Implemented parseWithStatement(). aziz parents: 176 diff changeset	2064 assert(token.type == T.With);
504b1b2f7c93 - Implemented parseWithStatement(). aziz parents: 176 diff changeset	2065 nT();
504b1b2f7c93 - Implemented parseWithStatement(). aziz parents: 176 diff changeset	2066 require(T.LParen);
504b1b2f7c93 - Implemented parseWithStatement(). aziz parents: 176 diff changeset	2067 auto expr = parseExpression();
504b1b2f7c93 - Implemented parseWithStatement(). aziz parents: 176 diff changeset	2068 require(T.RParen);
504b1b2f7c93 - Implemented parseWithStatement(). aziz parents: 176 diff changeset	2069 return new WithStatement(expr, parseScopeStatement());
504b1b2f7c93 - Implemented parseWithStatement(). aziz parents: 176 diff changeset	2070 }
504b1b2f7c93 - Implemented parseWithStatement(). aziz parents: 176 diff changeset	2071
178 62718b29679e - Implemented parseSynchronizedStatement(). aziz parents: 177 diff changeset	2072 Statement parseSynchronizedStatement()
62718b29679e - Implemented parseSynchronizedStatement(). aziz parents: 177 diff changeset	2073 {
62718b29679e - Implemented parseSynchronizedStatement(). aziz parents: 177 diff changeset	2074 assert(token.type == T.Synchronized);
62718b29679e - Implemented parseSynchronizedStatement(). aziz parents: 177 diff changeset	2075 nT();
62718b29679e - Implemented parseSynchronizedStatement(). aziz parents: 177 diff changeset	2076 Expression expr;
531 315aeb3f7a9b Added method skipped() to dil.Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 530 diff changeset	2077 if (skipped(T.LParen))
178 62718b29679e - Implemented parseSynchronizedStatement(). aziz parents: 177 diff changeset	2078 {
62718b29679e - Implemented parseSynchronizedStatement(). aziz parents: 177 diff changeset	2079 expr = parseExpression();
62718b29679e - Implemented parseSynchronizedStatement(). aziz parents: 177 diff changeset	2080 require(T.RParen);
62718b29679e - Implemented parseSynchronizedStatement(). aziz parents: 177 diff changeset	2081 }
62718b29679e - Implemented parseSynchronizedStatement(). aziz parents: 177 diff changeset	2082 return new SynchronizedStatement(expr, parseScopeStatement());
62718b29679e - Implemented parseSynchronizedStatement(). aziz parents: 177 diff changeset	2083 }
62718b29679e - Implemented parseSynchronizedStatement(). aziz parents: 177 diff changeset	2084
179 507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2085 Statement parseTryStatement()
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2086 {
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2087 assert(token.type == T.Try);
640 05645f5613c1 Added an error message. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 639 diff changeset	2088 auto begin = token;
179 507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2089 nT();
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2090
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2091 auto tryBody = parseScopeStatement();
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2092 CatchBody[] catchBodies;
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2093 FinallyBody finBody;
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2094
531 315aeb3f7a9b Added method skipped() to dil.Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 530 diff changeset	2095 while (skipped(T.Catch))
179 507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2096 {
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2097 Parameter param;
531 315aeb3f7a9b Added method skipped() to dil.Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 530 diff changeset	2098 if (skipped(T.LParen))
179 507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2099 {
640 05645f5613c1 Added an error message. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 639 diff changeset	2100 auto begin2 = token;
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	2101 Identifier* ident;
369 27767e203d64 - Added override attribute to ImportParser.start(). aziz parents: 368 diff changeset	2102 auto type = parseDeclarator(ident, true);
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	2103 param = new Parameter(StorageClass.None, type, ident, null);
640 05645f5613c1 Added an error message. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 639 diff changeset	2104 set(param, begin2);
179 507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2105 require(T.RParen);
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2106 }
640 05645f5613c1 Added an error message. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 639 diff changeset	2107 catchBodies ~= set(new CatchBody(param, parseNoScopeStatement()), begin);
179 507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2108 if (param is null)
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2109 break; // This is a LastCatch
640 05645f5613c1 Added an error message. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 639 diff changeset	2110 begin = token;
179 507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2111 }
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2112
640 05645f5613c1 Added an error message. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 639 diff changeset	2113 if (skipped(T.Finally))
05645f5613c1 Added an error message. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 639 diff changeset	2114 finBody = set(new FinallyBody(parseNoScopeStatement()), prevToken);
179 507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2115
396 0a4619735ce9 Applied fixes to Lexer, Parser and other classes. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 391 diff changeset	2116 if (catchBodies.length == 0 && finBody is null)
640 05645f5613c1 Added an error message. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 639 diff changeset	2117 assert(begin.type == T.Try), error(begin, MSG.MissingCatchOrFinally);
179 507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2118
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2119 return new TryStatement(tryBody, catchBodies, finBody);
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2120 }
507998c5c1ce - Implemented parseTryStatement(). aziz parents: 178 diff changeset	2121
180 d5a67aa578a8 - Implemented parseThrowStatement(). aziz parents: 179 diff changeset	2122 Statement parseThrowStatement()
d5a67aa578a8 - Implemented parseThrowStatement(). aziz parents: 179 diff changeset	2123 {
d5a67aa578a8 - Implemented parseThrowStatement(). aziz parents: 179 diff changeset	2124 assert(token.type == T.Throw);
d5a67aa578a8 - Implemented parseThrowStatement(). aziz parents: 179 diff changeset	2125 nT();
d5a67aa578a8 - Implemented parseThrowStatement(). aziz parents: 179 diff changeset	2126 auto expr = parseExpression();
d5a67aa578a8 - Implemented parseThrowStatement(). aziz parents: 179 diff changeset	2127 require(T.Semicolon);
d5a67aa578a8 - Implemented parseThrowStatement(). aziz parents: 179 diff changeset	2128 return new ThrowStatement(expr);
d5a67aa578a8 - Implemented parseThrowStatement(). aziz parents: 179 diff changeset	2129 }
d5a67aa578a8 - Implemented parseThrowStatement(). aziz parents: 179 diff changeset	2130
181 abfd51142477 - Implemented parseScopeGuardStatement(). aziz parents: 180 diff changeset	2131 Statement parseScopeGuardStatement()
abfd51142477 - Implemented parseScopeGuardStatement(). aziz parents: 180 diff changeset	2132 {
abfd51142477 - Implemented parseScopeGuardStatement(). aziz parents: 180 diff changeset	2133 assert(token.type == T.Scope);
abfd51142477 - Implemented parseScopeGuardStatement(). aziz parents: 180 diff changeset	2134 nT();
abfd51142477 - Implemented parseScopeGuardStatement(). aziz parents: 180 diff changeset	2135 assert(token.type == T.LParen);
abfd51142477 - Implemented parseScopeGuardStatement(). aziz parents: 180 diff changeset	2136 nT();
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	2137 auto condition = requireIdentifier(MSG.ExpectedScopeIdentifier);
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	2138 if (condition)
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	2139 switch (condition.identID)
181 abfd51142477 - Implemented parseScopeGuardStatement(). aziz parents: 180 diff changeset	2140 {
502 4e14cd1b24da Refactored code and added modules related to tabulated Identifiers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 501 diff changeset	2141 case ID.exit, ID.success, ID.failure:
181 abfd51142477 - Implemented parseScopeGuardStatement(). aziz parents: 180 diff changeset	2142 break;
abfd51142477 - Implemented parseScopeGuardStatement(). aziz parents: 180 diff changeset	2143 default:
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	2144 error(this.prevToken, MSG.InvalidScopeIdentifier, this.prevToken.srcText);
181 abfd51142477 - Implemented parseScopeGuardStatement(). aziz parents: 180 diff changeset	2145 }
abfd51142477 - Implemented parseScopeGuardStatement(). aziz parents: 180 diff changeset	2146 require(T.RParen);
abfd51142477 - Implemented parseScopeGuardStatement(). aziz parents: 180 diff changeset	2147 Statement scopeBody;
abfd51142477 - Implemented parseScopeGuardStatement(). aziz parents: 180 diff changeset	2148 if (token.type == T.LBrace)
abfd51142477 - Implemented parseScopeGuardStatement(). aziz parents: 180 diff changeset	2149 scopeBody = parseScopeStatement();
abfd51142477 - Implemented parseScopeGuardStatement(). aziz parents: 180 diff changeset	2150 else
abfd51142477 - Implemented parseScopeGuardStatement(). aziz parents: 180 diff changeset	2151 scopeBody = parseNoScopeStatement();
abfd51142477 - Implemented parseScopeGuardStatement(). aziz parents: 180 diff changeset	2152 return new ScopeGuardStatement(condition, scopeBody);
abfd51142477 - Implemented parseScopeGuardStatement(). aziz parents: 180 diff changeset	2153 }
abfd51142477 - Implemented parseScopeGuardStatement(). aziz parents: 180 diff changeset	2154
182 673b355ba0e9 - Implemented parseVolatileStatement(). aziz parents: 181 diff changeset	2155 Statement parseVolatileStatement()
673b355ba0e9 - Implemented parseVolatileStatement(). aziz parents: 181 diff changeset	2156 {
673b355ba0e9 - Implemented parseVolatileStatement(). aziz parents: 181 diff changeset	2157 assert(token.type == T.Volatile);
673b355ba0e9 - Implemented parseVolatileStatement(). aziz parents: 181 diff changeset	2158 nT();
673b355ba0e9 - Implemented parseVolatileStatement(). aziz parents: 181 diff changeset	2159 Statement volatileBody;
673b355ba0e9 - Implemented parseVolatileStatement(). aziz parents: 181 diff changeset	2160 if (token.type == T.Semicolon)
673b355ba0e9 - Implemented parseVolatileStatement(). aziz parents: 181 diff changeset	2161 nT();
673b355ba0e9 - Implemented parseVolatileStatement(). aziz parents: 181 diff changeset	2162 else if (token.type == T.LBrace)
673b355ba0e9 - Implemented parseVolatileStatement(). aziz parents: 181 diff changeset	2163 volatileBody = parseScopeStatement();
673b355ba0e9 - Implemented parseVolatileStatement(). aziz parents: 181 diff changeset	2164 else
219 0d14a09227a4 - Simplified parseScopeStatement(). aziz parents: 218 diff changeset	2165 volatileBody = parseStatement();
182 673b355ba0e9 - Implemented parseVolatileStatement(). aziz parents: 181 diff changeset	2166 return new VolatileStatement(volatileBody);
673b355ba0e9 - Implemented parseVolatileStatement(). aziz parents: 181 diff changeset	2167 }
673b355ba0e9 - Implemented parseVolatileStatement(). aziz parents: 181 diff changeset	2168
184 30a4c8522b09 - Implemented parsePragmaStatement(). aziz parents: 183 diff changeset	2169 Statement parsePragmaStatement()
30a4c8522b09 - Implemented parsePragmaStatement(). aziz parents: 183 diff changeset	2170 {
30a4c8522b09 - Implemented parsePragmaStatement(). aziz parents: 183 diff changeset	2171 assert(token.type == T.Pragma);
30a4c8522b09 - Implemented parsePragmaStatement(). aziz parents: 183 diff changeset	2172 nT();
30a4c8522b09 - Implemented parsePragmaStatement(). aziz parents: 183 diff changeset	2173
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	2174 Identifier* ident;
184 30a4c8522b09 - Implemented parsePragmaStatement(). aziz parents: 183 diff changeset	2175 Expression[] args;
30a4c8522b09 - Implemented parsePragmaStatement(). aziz parents: 183 diff changeset	2176 Statement pragmaBody;
30a4c8522b09 - Implemented parsePragmaStatement(). aziz parents: 183 diff changeset	2177
30a4c8522b09 - Implemented parsePragmaStatement(). aziz parents: 183 diff changeset	2178 require(T.LParen);
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	2179 ident = requireIdentifier(MSG.ExpectedPragmaIdentifier);
184 30a4c8522b09 - Implemented parsePragmaStatement(). aziz parents: 183 diff changeset	2180
531 315aeb3f7a9b Added method skipped() to dil.Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 530 diff changeset	2181 if (skipped(T.Comma))
486 bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	2182 args = parseExpressionList();
bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	2183 require(T.RParen);
184 30a4c8522b09 - Implemented parsePragmaStatement(). aziz parents: 183 diff changeset	2184
234 5c1111dc8670 - Added method parseNoScopeOrEmptyStatement(). aziz parents: 233 diff changeset	2185 pragmaBody = parseNoScopeOrEmptyStatement();
184 30a4c8522b09 - Implemented parsePragmaStatement(). aziz parents: 183 diff changeset	2186
30a4c8522b09 - Implemented parsePragmaStatement(). aziz parents: 183 diff changeset	2187 return new PragmaStatement(ident, args, pragmaBody);
30a4c8522b09 - Implemented parsePragmaStatement(). aziz parents: 183 diff changeset	2188 }
30a4c8522b09 - Implemented parsePragmaStatement(). aziz parents: 183 diff changeset	2189
186 d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2190 Statement parseStaticIfStatement()
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2191 {
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2192 assert(token.type == T.Static);
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2193 nT();
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2194 assert(token.type == T.If);
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2195 nT();
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2196 Expression condition;
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2197 Statement ifBody, elseBody;
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2198
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2199 require(T.LParen);
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2200 condition = parseExpression();
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2201 require(T.RParen);
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2202 ifBody = parseNoScopeStatement();
531 315aeb3f7a9b Added method skipped() to dil.Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 530 diff changeset	2203 if (skipped(T.Else))
186 d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2204 elseBody = parseNoScopeStatement();
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2205 return new StaticIfStatement(condition, ifBody, elseBody);
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2206 }
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2207
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2208 Statement parseStaticAssertStatement()
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2209 {
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2210 assert(token.type == T.Static);
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2211 nT();
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2212 assert(token.type == T.Assert);
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2213 nT();
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2214 Expression condition, message;
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2215 require(T.LParen);
555 d9e328c3bab9 Fixed infinite loop in dil.Parser.parseMixin(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 539 diff changeset	2216 condition = parseAssignExpression(); // Condition.
531 315aeb3f7a9b Added method skipped() to dil.Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 530 diff changeset	2217 if (skipped(T.Comma))
555 d9e328c3bab9 Fixed infinite loop in dil.Parser.parseMixin(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 539 diff changeset	2218 message = parseAssignExpression(); // Error message.
186 d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2219 require(T.RParen);
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2220 require(T.Semicolon);
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2221 return new StaticAssertStatement(condition, message);
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2222 }
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement(). aziz parents: 185 diff changeset	2223
190 d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2224 Statement parseDebugStatement()
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2225 {
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2226 assert(token.type == T.Debug);
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2227 nT(); // Skip debug keyword.
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2228
529 135e9e6933a7 Tidied up version/debug parser functions. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 528 diff changeset	2229 Token* cond;
190 d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2230 Statement debugBody, elseBody;
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2231
529 135e9e6933a7 Tidied up version/debug parser functions. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 528 diff changeset	2232 // ( Condition )
531 315aeb3f7a9b Added method skipped() to dil.Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 530 diff changeset	2233 if (skipped(T.LParen))
190 d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2234 {
529 135e9e6933a7 Tidied up version/debug parser functions. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 528 diff changeset	2235 cond = parseIdentOrInt();
135e9e6933a7 Tidied up version/debug parser functions. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 528 diff changeset	2236 require(T.RParen);
190 d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2237 }
529 135e9e6933a7 Tidied up version/debug parser functions. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 528 diff changeset	2238 // debug Statement
135e9e6933a7 Tidied up version/debug parser functions. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 528 diff changeset	2239 // debug ( Condition ) Statement
135e9e6933a7 Tidied up version/debug parser functions. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 528 diff changeset	2240 debugBody = parseNoScopeStatement();
135e9e6933a7 Tidied up version/debug parser functions. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 528 diff changeset	2241 // else Statement
531 315aeb3f7a9b Added method skipped() to dil.Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 530 diff changeset	2242 if (skipped(T.Else))
315aeb3f7a9b Added method skipped() to dil.Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 530 diff changeset	2243 elseBody = parseNoScopeStatement();
190 d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2244
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	2245 return new DebugStatement(cond, debugBody, elseBody);
190 d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2246 }
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2247
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2248 Statement parseVersionStatement()
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2249 {
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2250 assert(token.type == T.Version);
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2251 nT(); // Skip version keyword.
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2252
529 135e9e6933a7 Tidied up version/debug parser functions. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 528 diff changeset	2253 Token* cond;
190 d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2254 Statement versionBody, elseBody;
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2255
529 135e9e6933a7 Tidied up version/debug parser functions. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 528 diff changeset	2256 // ( Condition )
135e9e6933a7 Tidied up version/debug parser functions. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 528 diff changeset	2257 require(T.LParen);
135e9e6933a7 Tidied up version/debug parser functions. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 528 diff changeset	2258 cond = parseIdentOrInt();
135e9e6933a7 Tidied up version/debug parser functions. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 528 diff changeset	2259 require(T.RParen);
135e9e6933a7 Tidied up version/debug parser functions. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 528 diff changeset	2260 // version ( Condition ) Statement
135e9e6933a7 Tidied up version/debug parser functions. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 528 diff changeset	2261 versionBody = parseNoScopeStatement();
135e9e6933a7 Tidied up version/debug parser functions. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 528 diff changeset	2262 // else Statement
531 315aeb3f7a9b Added method skipped() to dil.Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 530 diff changeset	2263 if (skipped(T.Else))
315aeb3f7a9b Added method skipped() to dil.Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 530 diff changeset	2264 elseBody = parseNoScopeStatement();
190 d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2265
264 50cc74026ea8 - Changed some string types to Token. aziz* parents: 263 diff changeset	2266 return new VersionStatement(cond, versionBody, elseBody);
190 d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2267 }
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement(). aziz parents: 188 diff changeset	2268
161 82c5cfc7d6d3 - Started implementation of parsing statements. aziz parents: 160 diff changeset	2269 /+++++++++++++++++++++++++++++
183 c9df82f6f6be - Added parseAsmStatement() stub. aziz parents: 182 diff changeset	2270 + Assembler parsing methods +
c9df82f6f6be - Added parseAsmStatement() stub. aziz parents: 182 diff changeset	2271 +++++++++++++++++++++++++++++/
c9df82f6f6be - Added parseAsmStatement() stub. aziz parents: 182 diff changeset	2272
c9df82f6f6be - Added parseAsmStatement() stub. aziz parents: 182 diff changeset	2273 Statement parseAsmStatement()
c9df82f6f6be - Added parseAsmStatement() stub. aziz parents: 182 diff changeset	2274 {
c9df82f6f6be - Added parseAsmStatement() stub. aziz parents: 182 diff changeset	2275 assert(token.type == T.Asm);
285 104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2276 nT(); // Skip asm keyword.
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2277 require(T.LBrace);
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2278 auto ss = new Statements;
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2279 while (token.type != T.RBrace && token.type != T.EOF)
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2280 ss ~= parseAsmInstruction();
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2281 require(T.RBrace);
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2282 return new AsmStatement(ss);
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2283 }
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2284
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2285 Statement parseAsmInstruction()
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2286 {
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2287 auto begin = token;
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2288 Statement s;
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	2289 Identifier* ident;
285 104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2290 switch (token.type)
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2291 {
374 6d22f0b6a674 - Added class AsmAlignStatement. aziz parents: 369 diff changeset	2292 // Keywords that are valid opcodes.
6d22f0b6a674 - Added class AsmAlignStatement. aziz parents: 369 diff changeset	2293 case T.In, T.Int, T.Out:
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	2294 ident = token.ident;
374 6d22f0b6a674 - Added class AsmAlignStatement. aziz parents: 369 diff changeset	2295 nT();
6d22f0b6a674 - Added class AsmAlignStatement. aziz parents: 369 diff changeset	2296 goto LOpcode;
285 104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2297 case T.Identifier:
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	2298 ident = token.ident;
374 6d22f0b6a674 - Added class AsmAlignStatement. aziz parents: 369 diff changeset	2299 nT(); // Skip Identifier
531 315aeb3f7a9b Added method skipped() to dil.Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 530 diff changeset	2300 if (skipped(T.Colon))
285 104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2301 {
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2302 // Identifier : AsmInstruction
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2303 s = new LabeledStatement(ident, parseAsmInstruction());
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2304 break;
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2305 }
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2306
374 6d22f0b6a674 - Added class AsmAlignStatement. aziz parents: 369 diff changeset	2307 LOpcode:
285 104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2308 // Opcode ;
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2309 // Opcode Operands ;
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2310 // Opcode
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2311 // Identifier
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2312 Expression[] es;
374 6d22f0b6a674 - Added class AsmAlignStatement. aziz parents: 369 diff changeset	2313 if (token.type != T.Semicolon)
632 20dddcc54621 Fixed parsing of AsmPostBracketExpression. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 631 diff changeset	2314 do
285 104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2315 es ~= parseAsmExpression();
632 20dddcc54621 Fixed parsing of AsmPostBracketExpression. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 631 diff changeset	2316 while (skipped(T.Comma))
285 104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2317 require(T.Semicolon);
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2318 s = new AsmInstruction(ident, es);
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2319 break;
374 6d22f0b6a674 - Added class AsmAlignStatement. aziz parents: 369 diff changeset	2320 case T.Align:
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	2321 // align Integer;
374 6d22f0b6a674 - Added class AsmAlignStatement. aziz parents: 369 diff changeset	2322 nT();
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	2323 int number = -1;
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	2324 if (token.type == T.Int32)
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	2325 (number = token.int_), nT();
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	2326 else
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	2327 error(token, MSG.ExpectedIntegerAfterAlign, token.srcText);
374 6d22f0b6a674 - Added class AsmAlignStatement. aziz parents: 369 diff changeset	2328 require(T.Semicolon);
6d22f0b6a674 - Added class AsmAlignStatement. aziz parents: 369 diff changeset	2329 s = new AsmAlignStatement(number);
6d22f0b6a674 - Added class AsmAlignStatement. aziz parents: 369 diff changeset	2330 break;
285 104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2331 case T.Semicolon:
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2332 s = new EmptyStatement();
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2333 nT();
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2334 break;
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2335 default:
496 5a607597dc22 Improved error recovery in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 495 diff changeset	2336 s = new IllegalAsmInstruction();
5a607597dc22 Improved error recovery in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 495 diff changeset	2337 // Skip to next valid token.
5a607597dc22 Improved error recovery in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 495 diff changeset	2338 do
5a607597dc22 Improved error recovery in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 495 diff changeset	2339 nT();
5a607597dc22 Improved error recovery in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 495 diff changeset	2340 while (!token.isAsmInstructionStart &&
5a607597dc22 Improved error recovery in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 495 diff changeset	2341 token.type != T.RBrace &&
5a607597dc22 Improved error recovery in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 495 diff changeset	2342 token.type != T.EOF)
5a607597dc22 Improved error recovery in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 495 diff changeset	2343 auto text = Token.textSpan(begin, this.prevToken);
616 506ce60760d8 Fixed some error messages. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 608 diff changeset	2344 error(begin, MSG.IllegalAsmInstruction, text);
285 104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2345 }
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2346 set(s, begin);
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2347 return s;
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2348 }
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2349
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2350 Expression parseAsmExpression()
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2351 {
287 211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2352 auto begin = token;
374 6d22f0b6a674 - Added class AsmAlignStatement. aziz parents: 369 diff changeset	2353 auto e = parseAsmOrOrExpression();
531 315aeb3f7a9b Added method skipped() to dil.Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 530 diff changeset	2354 if (skipped(T.Question))
287 211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2355 {
531 315aeb3f7a9b Added method skipped() to dil.Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 530 diff changeset	2356 auto tok = this.prevToken;
287 211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2357 auto iftrue = parseAsmExpression();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2358 require(T.Colon);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2359 auto iffalse = parseAsmExpression();
293 418c6548ce17 - Assigning to Node.children in several constructors that inherit from Node. aziz parents: 292 diff changeset	2360 e = new CondExpression(e, iftrue, iffalse, tok);
287 211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2361 set(e, begin);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2362 }
288 833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2363 // TODO: create AsmExpression that contains e?
287 211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2364 return e;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2365 }
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2366
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2367 Expression parseAsmOrOrExpression()
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2368 {
375 0bd21b746a04 - Added code to main() for recognizing options to the importgraph command. aziz parents: 374 diff changeset	2369 alias parseAsmAndAndExpression parseNext;
287 211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2370 auto begin = token;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2371 auto e = parseNext();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2372 while (token.type == T.OrLogical)
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2373 {
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2374 auto tok = token;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2375 nT();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2376 e = new OrOrExpression(e, parseNext(), tok);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2377 set(e, begin);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2378 }
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2379 return e;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2380 }
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2381
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2382 Expression parseAsmAndAndExpression()
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2383 {
375 0bd21b746a04 - Added code to main() for recognizing options to the importgraph command. aziz parents: 374 diff changeset	2384 alias parseAsmOrExpression parseNext;
287 211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2385 auto begin = token;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2386 auto e = parseNext();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2387 while (token.type == T.AndLogical)
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2388 {
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2389 auto tok = token;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2390 nT();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2391 e = new AndAndExpression(e, parseNext(), tok);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2392 set(e, begin);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2393 }
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2394 return e;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2395 }
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2396
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2397 Expression parseAsmOrExpression()
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2398 {
375 0bd21b746a04 - Added code to main() for recognizing options to the importgraph command. aziz parents: 374 diff changeset	2399 alias parseAsmXorExpression parseNext;
287 211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2400 auto begin = token;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2401 auto e = parseNext();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2402 while (token.type == T.OrBinary)
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2403 {
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2404 auto tok = token;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2405 nT();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2406 e = new OrExpression(e, parseNext(), tok);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2407 set(e, begin);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2408 }
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2409 return e;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2410 }
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2411
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2412 Expression parseAsmXorExpression()
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2413 {
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2414 alias parseAsmAndExpression parseNext;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2415 auto begin = token;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2416 auto e = parseNext();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2417 while (token.type == T.Xor)
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2418 {
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2419 auto tok = token;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2420 nT();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2421 e = new XorExpression(e, parseNext(), tok);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2422 set(e, begin);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2423 }
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2424 return e;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2425 }
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2426
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2427 Expression parseAsmAndExpression()
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2428 {
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2429 alias parseAsmCmpExpression parseNext;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2430 auto begin = token;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2431 auto e = parseNext();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2432 while (token.type == T.AndBinary)
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2433 {
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2434 auto tok = token;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2435 nT();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2436 e = new AndExpression(e, parseNext(), tok);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2437 set(e, begin);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2438 }
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2439 return e;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2440 }
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2441
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2442 Expression parseAsmCmpExpression()
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2443 {
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2444 alias parseAsmShiftExpression parseNext;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2445 auto begin = token;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2446 auto e = parseNext();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2447
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2448 auto operator = token;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2449 switch (operator.type)
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2450 {
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2451 case T.Equal, T.NotEqual:
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2452 nT();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2453 e = new EqualExpression(e, parseNext(), operator);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2454 break;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2455 case T.LessEqual, T.Less, T.GreaterEqual, T.Greater:
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2456 nT();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2457 e = new RelExpression(e, parseNext(), operator);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2458 break;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2459 default:
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2460 return e;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2461 }
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2462 set(e, begin);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2463 return e;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2464 }
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2465
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2466 Expression parseAsmShiftExpression()
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2467 {
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2468 alias parseAsmAddExpression parseNext;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2469 auto begin = token;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2470 auto e = parseNext();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2471 while (1)
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2472 {
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2473 auto operator = token;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2474 switch (operator.type)
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2475 {
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2476 case T.LShift: nT(); e = new LShiftExpression(e, parseNext(), operator); break;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2477 case T.RShift: nT(); e = new RShiftExpression(e, parseNext(), operator); break;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2478 case T.URShift: nT(); e = new URShiftExpression(e, parseNext(), operator); break;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2479 default:
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2480 return e;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2481 }
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2482 set(e, begin);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2483 }
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2484 assert(0);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2485 }
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2486
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2487 Expression parseAsmAddExpression()
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2488 {
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2489 alias parseAsmMulExpression parseNext;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2490 auto begin = token;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2491 auto e = parseNext();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2492 while (1)
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2493 {
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2494 auto operator = token;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2495 switch (operator.type)
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2496 {
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2497 case T.Plus: nT(); e = new PlusExpression(e, parseNext(), operator); break;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2498 case T.Minus: nT(); e = new MinusExpression(e, parseNext(), operator); break;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2499 // Not allowed in asm
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2500 //case T.Tilde: nT(); e = new CatExpression(e, parseNext(), operator); break;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2501 default:
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2502 return e;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2503 }
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2504 set(e, begin);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2505 }
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2506 assert(0);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2507 }
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2508
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2509 Expression parseAsmMulExpression()
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2510 {
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2511 alias parseAsmPostExpression parseNext;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2512 auto begin = token;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2513 auto e = parseNext();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2514 while (1)
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2515 {
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2516 auto operator = token;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2517 switch (operator.type)
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2518 {
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2519 case T.Mul: nT(); e = new MulExpression(e, parseNext(), operator); break;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2520 case T.Div: nT(); e = new DivExpression(e, parseNext(), operator); break;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2521 case T.Mod: nT(); e = new ModExpression(e, parseNext(), operator); break;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2522 default:
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2523 return e;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2524 }
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2525 set(e, begin);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2526 }
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2527 assert(0);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2528 }
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2529
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2530 Expression parseAsmPostExpression()
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2531 {
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2532 auto begin = token;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2533 auto e = parseAsmUnaryExpression();
632 20dddcc54621 Fixed parsing of AsmPostBracketExpression. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 631 diff changeset	2534 while (skipped(T.LBracket))
287 211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2535 {
632 20dddcc54621 Fixed parsing of AsmPostBracketExpression. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 631 diff changeset	2536 e = new AsmPostBracketExpression(e, parseAsmExpression());
287 211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2537 require(T.RBracket);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2538 set(e, begin);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2539 }
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2540 return e;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2541 }
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2542
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2543 Expression parseAsmUnaryExpression()
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2544 {
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2545 auto begin = token;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2546 Expression e;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2547 switch (token.type)
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2548 {
374 6d22f0b6a674 - Added class AsmAlignStatement. aziz parents: 369 diff changeset	2549 case T.Byte, T.Short, T.Int,
6d22f0b6a674 - Added class AsmAlignStatement. aziz parents: 369 diff changeset	2550 T.Float, T.Double, T.Real:
6d22f0b6a674 - Added class AsmAlignStatement. aziz parents: 369 diff changeset	2551 goto LAsmTypePrefix;
287 211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2552 case T.Identifier:
502 4e14cd1b24da Refactored code and added modules related to tabulated Identifiers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 501 diff changeset	2553 switch (token.ident.identID)
287 211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2554 {
502 4e14cd1b24da Refactored code and added modules related to tabulated Identifiers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 501 diff changeset	2555 case ID.near, ID.far,/* "byte", "short", "int",*/
4e14cd1b24da Refactored code and added modules related to tabulated Identifiers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 501 diff changeset	2556 ID.word, ID.dword, ID.qword/, "float", "double", "real"/:
374 6d22f0b6a674 - Added class AsmAlignStatement. aziz parents: 369 diff changeset	2557 LAsmTypePrefix:
287 211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2558 nT();
502 4e14cd1b24da Refactored code and added modules related to tabulated Identifiers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 501 diff changeset	2559 if (token.type == T.Identifier && token.ident is Ident.ptr)
287 211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2560 nT();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2561 else
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2562 error(MID.ExpectedButFound, "ptr", token.srcText);
374 6d22f0b6a674 - Added class AsmAlignStatement. aziz parents: 369 diff changeset	2563 e = new AsmTypeExpression(parseAsmExpression());
287 211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2564 break;
502 4e14cd1b24da Refactored code and added modules related to tabulated Identifiers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 501 diff changeset	2565 case ID.offset:
287 211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2566 nT();
374 6d22f0b6a674 - Added class AsmAlignStatement. aziz parents: 369 diff changeset	2567 e = new AsmOffsetExpression(parseAsmExpression());
287 211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2568 break;
502 4e14cd1b24da Refactored code and added modules related to tabulated Identifiers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 501 diff changeset	2569 case ID.seg:
287 211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2570 nT();
374 6d22f0b6a674 - Added class AsmAlignStatement. aziz parents: 369 diff changeset	2571 e = new AsmSegExpression(parseAsmExpression());
287 211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2572 break;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2573 default:
374 6d22f0b6a674 - Added class AsmAlignStatement. aziz parents: 369 diff changeset	2574 goto LparseAsmPrimaryExpression;
287 211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2575 }
374 6d22f0b6a674 - Added class AsmAlignStatement. aziz parents: 369 diff changeset	2576 break;
287 211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2577 case T.Minus:
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2578 case T.Plus:
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2579 nT();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2580 e = new SignExpression(parseAsmUnaryExpression());
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2581 break;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2582 case T.Not:
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2583 nT();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2584 e = new NotExpression(parseAsmUnaryExpression());
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2585 break;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2586 case T.Tilde:
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2587 nT();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2588 e = new CompExpression(parseAsmUnaryExpression());
618 07946b379006 Refactored the way dot expressions are parsed. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 616 diff changeset	2589 break;
07946b379006 Refactored the way dot expressions are parsed. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 616 diff changeset	2590 case T.Dot:
07946b379006 Refactored the way dot expressions are parsed. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 616 diff changeset	2591 nT();
07946b379006 Refactored the way dot expressions are parsed. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 616 diff changeset	2592 e = new ModuleScopeExpression(parseIdentifierExpression());
632 20dddcc54621 Fixed parsing of AsmPostBracketExpression. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 631 diff changeset	2593 while (skipped(TOK.Dot))
20dddcc54621 Fixed parsing of AsmPostBracketExpression. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 631 diff changeset	2594 {
20dddcc54621 Fixed parsing of AsmPostBracketExpression. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 631 diff changeset	2595 e = new DotExpression(e, parseIdentifierExpression());
20dddcc54621 Fixed parsing of AsmPostBracketExpression. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 631 diff changeset	2596 set(e, begin);
20dddcc54621 Fixed parsing of AsmPostBracketExpression. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 631 diff changeset	2597 }
618 07946b379006 Refactored the way dot expressions are parsed. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 616 diff changeset	2598 break;
287 211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2599 default:
374 6d22f0b6a674 - Added class AsmAlignStatement. aziz parents: 369 diff changeset	2600 LparseAsmPrimaryExpression:
287 211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2601 e = parseAsmPrimaryExpression();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2602 return e;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2603 }
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2604 set(e, begin);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2605 return e;
183 c9df82f6f6be - Added parseAsmStatement() stub. aziz parents: 182 diff changeset	2606 }
c9df82f6f6be - Added parseAsmStatement() stub. aziz parents: 182 diff changeset	2607
285 104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2608 Expression parseAsmPrimaryExpression()
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2609 {
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2610 auto begin = token;
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2611 Expression e;
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2612 switch (token.type)
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2613 {
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2614 case T.Int32, T.Int64, T.Uint32, T.Uint64:
537 db7913148b29 Added constructors and semantic() methods. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 536 diff changeset	2615 e = new IntExpression(token);
285 104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2616 nT();
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2617 break;
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2618 case T.Float32, T.Float64, T.Float80,
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2619 T.Imaginary32, T.Imaginary64, T.Imaginary80:
539 3418027c3914 Added semantic() method to RealExpression. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 537 diff changeset	2620 e = new RealExpression(token);
285 104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2621 nT();
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2622 break;
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2623 case T.Dollar:
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2624 e = new DollarExpression();
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2625 nT();
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2626 break;
287 211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2627 case T.LBracket:
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2628 // [ AsmExpression ]
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2629 nT();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2630 e = parseAsmExpression();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2631 require(T.RBracket);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2632 e = new AsmBracketExpression(e);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression. aziz parents: 285 diff changeset	2633 break;
288 833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2634 case T.Identifier:
502 4e14cd1b24da Refactored code and added modules related to tabulated Identifiers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 501 diff changeset	2635 auto register = token.ident;
4e14cd1b24da Refactored code and added modules related to tabulated Identifiers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 501 diff changeset	2636 switch (register.identID)
288 833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2637 {
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2638 // __LOCAL_SIZE
502 4e14cd1b24da Refactored code and added modules related to tabulated Identifiers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 501 diff changeset	2639 case ID.__LOCAL_SIZE:
4e14cd1b24da Refactored code and added modules related to tabulated Identifiers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 501 diff changeset	2640 nT();
288 833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2641 e = new AsmLocalSizeExpression();
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2642 break;
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2643 // Register
502 4e14cd1b24da Refactored code and added modules related to tabulated Identifiers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 501 diff changeset	2644 case ID.ST:
288 833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2645 nT();
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2646 // (1) - (7)
502 4e14cd1b24da Refactored code and added modules related to tabulated Identifiers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 501 diff changeset	2647 int number = -1;
531 315aeb3f7a9b Added method skipped() to dil.Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 530 diff changeset	2648 if (skipped(T.LParen))
288 833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2649 {
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2650 if (token.type == T.Int32)
502 4e14cd1b24da Refactored code and added modules related to tabulated Identifiers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 501 diff changeset	2651 (number = token.int_), nT();
288 833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2652 else
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2653 expected(T.Int32);
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2654 require(T.RParen);
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2655 }
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2656 e = new AsmRegisterExpression(register, number);
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2657 break;
502 4e14cd1b24da Refactored code and added modules related to tabulated Identifiers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 501 diff changeset	2658 case ID.FS:
417 8af5c7e2f722 Fixed parsing asm FS register. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 415 diff changeset	2659 nT();
8af5c7e2f722 Fixed parsing asm FS register. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 415 diff changeset	2660 // TODO: is the colon-number part optional?
502 4e14cd1b24da Refactored code and added modules related to tabulated Identifiers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 501 diff changeset	2661 int number = -1;
531 315aeb3f7a9b Added method skipped() to dil.Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 530 diff changeset	2662 if (skipped(T.Colon))
417 8af5c7e2f722 Fixed parsing asm FS register. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 415 diff changeset	2663 {
8af5c7e2f722 Fixed parsing asm FS register. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 415 diff changeset	2664 // :0, :4, :8
502 4e14cd1b24da Refactored code and added modules related to tabulated Identifiers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 501 diff changeset	2665 if (token.type == T.Int32)
4e14cd1b24da Refactored code and added modules related to tabulated Identifiers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 501 diff changeset	2666 (number = token.int_), nT();
4e14cd1b24da Refactored code and added modules related to tabulated Identifiers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 501 diff changeset	2667 if (number != 0 && number != 4 && number != 8)
417 8af5c7e2f722 Fixed parsing asm FS register. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 415 diff changeset	2668 error(MID.ExpectedButFound, "0, 4 or 8", token.srcText);
8af5c7e2f722 Fixed parsing asm FS register. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 415 diff changeset	2669 }
8af5c7e2f722 Fixed parsing asm FS register. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 415 diff changeset	2670 e = new AsmRegisterExpression(register, number);
8af5c7e2f722 Fixed parsing asm FS register. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 415 diff changeset	2671 break;
502 4e14cd1b24da Refactored code and added modules related to tabulated Identifiers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 501 diff changeset	2672 case ID.AL, ID.AH, ID.AX, ID.EAX,
4e14cd1b24da Refactored code and added modules related to tabulated Identifiers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 501 diff changeset	2673 ID.BL, ID.BH, ID.BX, ID.EBX,
4e14cd1b24da Refactored code and added modules related to tabulated Identifiers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 501 diff changeset	2674 ID.CL, ID.CH, ID.CX, ID.ECX,
4e14cd1b24da Refactored code and added modules related to tabulated Identifiers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 501 diff changeset	2675 ID.DL, ID.DH, ID.DX, ID.EDX,
4e14cd1b24da Refactored code and added modules related to tabulated Identifiers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 501 diff changeset	2676 ID.BP, ID.EBP, ID.SP, ID.ESP,
4e14cd1b24da Refactored code and added modules related to tabulated Identifiers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 501 diff changeset	2677 ID.DI, ID.EDI, ID.SI, ID.ESI,
4e14cd1b24da Refactored code and added modules related to tabulated Identifiers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 501 diff changeset	2678 ID.ES, ID.CS, ID.SS, ID.DS, ID.GS,
4e14cd1b24da Refactored code and added modules related to tabulated Identifiers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 501 diff changeset	2679 ID.CR0, ID.CR2, ID.CR3, ID.CR4,
4e14cd1b24da Refactored code and added modules related to tabulated Identifiers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 501 diff changeset	2680 ID.DR0, ID.DR1, ID.DR2, ID.DR3, ID.DR6, ID.DR7,
4e14cd1b24da Refactored code and added modules related to tabulated Identifiers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 501 diff changeset	2681 ID.TR3, ID.TR4, ID.TR5, ID.TR6, ID.TR7,
4e14cd1b24da Refactored code and added modules related to tabulated Identifiers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 501 diff changeset	2682 ID.MM0, ID.MM1, ID.MM2, ID.MM3,
4e14cd1b24da Refactored code and added modules related to tabulated Identifiers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 501 diff changeset	2683 ID.MM4, ID.MM5, ID.MM6, ID.MM7,
4e14cd1b24da Refactored code and added modules related to tabulated Identifiers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 501 diff changeset	2684 ID.XMM0, ID.XMM1, ID.XMM2, ID.XMM3,
4e14cd1b24da Refactored code and added modules related to tabulated Identifiers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 501 diff changeset	2685 ID.XMM4, ID.XMM5, ID.XMM6, ID.XMM7:
4e14cd1b24da Refactored code and added modules related to tabulated Identifiers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 501 diff changeset	2686 nT();
4e14cd1b24da Refactored code and added modules related to tabulated Identifiers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 501 diff changeset	2687 e = new AsmRegisterExpression(register);
288 833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2688 break;
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2689 default:
618 07946b379006 Refactored the way dot expressions are parsed. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 616 diff changeset	2690 e = parseIdentifierExpression();
07946b379006 Refactored the way dot expressions are parsed. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 616 diff changeset	2691 while (skipped(TOK.Dot))
288 833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2692 {
618 07946b379006 Refactored the way dot expressions are parsed. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 616 diff changeset	2693 e = new DotExpression(e, parseIdentifierExpression());
07946b379006 Refactored the way dot expressions are parsed. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 616 diff changeset	2694 set(e, begin);
288 833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2695 }
618 07946b379006 Refactored the way dot expressions are parsed. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 616 diff changeset	2696 } // end of switch
288 833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression. aziz parents: 287 diff changeset	2697 break;
285 104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2698 default:
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2699 error(MID.ExpectedButFound, "Expression", token.srcText);
659 304331ca2f95 Renamed EmptyExpression to IllegalExpression. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 655 diff changeset	2700 e = new IllegalExpression();
414 9c69615a4876 Added method insertEmptyTokenBefore() to Lexer. Made some fixes, too. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 409 diff changeset	2701 if (!trying)
653 29cc5bf3ce89 Refactored StringExpression. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 650 diff changeset	2702 { // Insert a dummy token and don't consume current one.
619 933cd8d24467 Renamed Parser.lx to Parser.lexer. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 618 diff changeset	2703 begin = lexer.insertEmptyTokenBefore(token);
502 4e14cd1b24da Refactored code and added modules related to tabulated Identifiers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 501 diff changeset	2704 this.prevToken = begin;
414 9c69615a4876 Added method insertEmptyTokenBefore() to Lexer. Made some fixes, too. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 409 diff changeset	2705 }
285 104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2706 }
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2707 set(e, begin);
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2708 return e;
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2709 }
104343e0f097 - Started implementation of asm statements parser. aziz parents: 284 diff changeset	2710
183 c9df82f6f6be - Added parseAsmStatement() stub. aziz parents: 182 diff changeset	2711 /+++++++++++++++++++++++++++++
102 6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	2712 + Expression parsing methods +
6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	2713 +++++++++++++++++++++++++++++/
6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	2714
72 f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	2715 Expression parseExpression()
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	2716 {
653 29cc5bf3ce89 Refactored StringExpression. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 650 diff changeset	2717 alias parseAssignExpression parseNext;
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	2718 auto begin = token;
653 29cc5bf3ce89 Refactored StringExpression. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 650 diff changeset	2719 auto e = parseNext();
122 9849a263f148 - Added method parseDeclarationsBlock(). aziz parents: 121 diff changeset	2720 while (token.type == T.Comma)
235 3384ac8878f7 - Fixed parseExpression(). Forgot to skip T.Comma. aziz parents: 234 diff changeset	2721 {
251 67a798459532 - Added parameter Token* tok to some Expression constructors. Adapted parser accordingly. aziz parents: 250 diff changeset	2722 auto comma = token;
235 3384ac8878f7 - Fixed parseExpression(). Forgot to skip T.Comma. aziz parents: 234 diff changeset	2723 nT();
653 29cc5bf3ce89 Refactored StringExpression. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 650 diff changeset	2724 e = new CommaExpression(e, parseNext(), comma);
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	2725 set(e, begin);
235 3384ac8878f7 - Fixed parseExpression(). Forgot to skip T.Comma. aziz parents: 234 diff changeset	2726 }
72 f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	2727 return e;
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	2728 }
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	2729
71 b3777cca323c - Added Identity and NotIdentity tokens. aziz parents: 70 diff changeset	2730 Expression parseAssignExpression()
b3777cca323c - Added Identity and NotIdentity tokens. aziz parents: 70 diff changeset	2731 {
653 29cc5bf3ce89 Refactored StringExpression. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 650 diff changeset	2732 alias parseAssignExpression parseNext;
319 83f1f9a4f248 - Removed assigment to 'begin' from loop. Initializing 'begin' at decl point. aziz parents: 318 diff changeset	2733 auto begin = token;
71 b3777cca323c - Added Identity and NotIdentity tokens. aziz parents: 70 diff changeset	2734 auto e = parseCondExpression();
653 29cc5bf3ce89 Refactored StringExpression. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 650 diff changeset	2735 switch (token.type)
71 b3777cca323c - Added Identity and NotIdentity tokens. aziz parents: 70 diff changeset	2736 {
653 29cc5bf3ce89 Refactored StringExpression. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 650 diff changeset	2737 case T.Assign:
29cc5bf3ce89 Refactored StringExpression. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 650 diff changeset	2738 nT(); e = new AssignExpression(e, parseNext()); break;
29cc5bf3ce89 Refactored StringExpression. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 650 diff changeset	2739 case T.LShiftAssign:
29cc5bf3ce89 Refactored StringExpression. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 650 diff changeset	2740 nT(); e = new LShiftAssignExpression(e, parseNext()); break;
29cc5bf3ce89 Refactored StringExpression. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 650 diff changeset	2741 case T.RShiftAssign:
29cc5bf3ce89 Refactored StringExpression. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 650 diff changeset	2742 nT(); e = new RShiftAssignExpression(e, parseNext()); break;
29cc5bf3ce89 Refactored StringExpression. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 650 diff changeset	2743 case T.URShiftAssign:
29cc5bf3ce89 Refactored StringExpression. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 650 diff changeset	2744 nT(); e = new URShiftAssignExpression(e, parseNext()); break;
29cc5bf3ce89 Refactored StringExpression. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 650 diff changeset	2745 case T.OrAssign:
29cc5bf3ce89 Refactored StringExpression. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 650 diff changeset	2746 nT(); e = new OrAssignExpression(e, parseNext()); break;
29cc5bf3ce89 Refactored StringExpression. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 650 diff changeset	2747 case T.AndAssign:
29cc5bf3ce89 Refactored StringExpression. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 650 diff changeset	2748 nT(); e = new AndAssignExpression(e, parseNext()); break;
29cc5bf3ce89 Refactored StringExpression. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 650 diff changeset	2749 case T.PlusAssign:
29cc5bf3ce89 Refactored StringExpression. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 650 diff changeset	2750 nT(); e = new PlusAssignExpression(e, parseNext()); break;
29cc5bf3ce89 Refactored StringExpression. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 650 diff changeset	2751 case T.MinusAssign:
29cc5bf3ce89 Refactored StringExpression. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 650 diff changeset	2752 nT(); e = new MinusAssignExpression(e, parseNext()); break;
29cc5bf3ce89 Refactored StringExpression. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 650 diff changeset	2753 case T.DivAssign:
29cc5bf3ce89 Refactored StringExpression. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 650 diff changeset	2754 nT(); e = new DivAssignExpression(e, parseNext()); break;
29cc5bf3ce89 Refactored StringExpression. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 650 diff changeset	2755 case T.MulAssign:
29cc5bf3ce89 Refactored StringExpression. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 650 diff changeset	2756 nT(); e = new MulAssignExpression(e, parseNext()); break;
29cc5bf3ce89 Refactored StringExpression. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 650 diff changeset	2757 case T.ModAssign:
29cc5bf3ce89 Refactored StringExpression. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 650 diff changeset	2758 nT(); e = new ModAssignExpression(e, parseNext()); break;
29cc5bf3ce89 Refactored StringExpression. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 650 diff changeset	2759 case T.XorAssign:
29cc5bf3ce89 Refactored StringExpression. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 650 diff changeset	2760 nT(); e = new XorAssignExpression(e, parseNext()); break;
29cc5bf3ce89 Refactored StringExpression. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 650 diff changeset	2761 case T.CatAssign:
29cc5bf3ce89 Refactored StringExpression. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 650 diff changeset	2762 nT(); e = new CatAssignExpression(e, parseNext()); break;
29cc5bf3ce89 Refactored StringExpression. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 650 diff changeset	2763 default:
29cc5bf3ce89 Refactored StringExpression. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 650 diff changeset	2764 return e;
71 b3777cca323c - Added Identity and NotIdentity tokens. aziz parents: 70 diff changeset	2765 }
653 29cc5bf3ce89 Refactored StringExpression. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 650 diff changeset	2766 set(e, begin);
71 b3777cca323c - Added Identity and NotIdentity tokens. aziz parents: 70 diff changeset	2767 return e;
b3777cca323c - Added Identity and NotIdentity tokens. aziz parents: 70 diff changeset	2768 }
72 f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	2769
71 b3777cca323c - Added Identity and NotIdentity tokens. aziz parents: 70 diff changeset	2770 Expression parseCondExpression()
b3777cca323c - Added Identity and NotIdentity tokens. aziz parents: 70 diff changeset	2771 {
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	2772 auto begin = token;
72 f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	2773 auto e = parseOrOrExpression();
87 c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	2774 if (token.type == T.Question)
72 f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	2775 {
293 418c6548ce17 - Assigning to Node.children in several constructors that inherit from Node. aziz parents: 292 diff changeset	2776 auto tok = token;
72 f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	2777 nT();
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	2778 auto iftrue = parseExpression();
87 c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	2779 require(T.Colon);
72 f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	2780 auto iffalse = parseCondExpression();
293 418c6548ce17 - Assigning to Node.children in several constructors that inherit from Node. aziz parents: 292 diff changeset	2781 e = new CondExpression(e, iftrue, iffalse, tok);
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	2782 set(e, begin);
72 f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	2783 }
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	2784 return e;
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	2785 }
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	2786
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	2787 Expression parseOrOrExpression()
f75e359f939f - Added parseExpression() method. aziz parents: 71 diff changeset	2788 {
486 bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	2789 alias parseAndAndExpression parseNext;
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	2790 auto begin = token;
73 11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	2791 auto e = parseNext();
223 043722eed46e - Fix: if-statements should be while-statements. aziz parents: 222 diff changeset	2792 while (token.type == T.OrLogical)
73 11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	2793 {
251 67a798459532 - Added parameter Token* tok to some Expression constructors. Adapted parser accordingly. aziz parents: 250 diff changeset	2794 auto tok = token;
73 11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	2795 nT();
251 67a798459532 - Added parameter Token* tok to some Expression constructors. Adapted parser accordingly. aziz parents: 250 diff changeset	2796 e = new OrOrExpression(e, parseNext(), tok);
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	2797 set(e, begin);
73 11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	2798 }
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	2799 return e;
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	2800 }
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	2801
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	2802 Expression parseAndAndExpression()
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	2803 {
486 bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	2804 alias parseOrExpression parseNext;
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	2805 auto begin = token;
73 11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	2806 auto e = parseNext();
223 043722eed46e - Fix: if-statements should be while-statements. aziz parents: 222 diff changeset	2807 while (token.type == T.AndLogical)
73 11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	2808 {
251 67a798459532 - Added parameter Token* tok to some Expression constructors. Adapted parser accordingly. aziz parents: 250 diff changeset	2809 auto tok = token;
73 11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	2810 nT();
251 67a798459532 - Added parameter Token* tok to some Expression constructors. Adapted parser accordingly. aziz parents: 250 diff changeset	2811 e = new AndAndExpression(e, parseNext(), tok);
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	2812 set(e, begin);
73 11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	2813 }
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	2814 return e;
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	2815 }
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	2816
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	2817 Expression parseOrExpression()
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	2818 {
486 bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	2819 alias parseXorExpression parseNext;
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	2820 auto begin = token;
73 11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	2821 auto e = parseNext();
223 043722eed46e - Fix: if-statements should be while-statements. aziz parents: 222 diff changeset	2822 while (token.type == T.OrBinary)
73 11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	2823 {
251 67a798459532 - Added parameter Token* tok to some Expression constructors. Adapted parser accordingly. aziz parents: 250 diff changeset	2824 auto tok = token;
73 11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	2825 nT();
251 67a798459532 - Added parameter Token* tok to some Expression constructors. Adapted parser accordingly. aziz parents: 250 diff changeset	2826 e = new OrExpression(e, parseNext(), tok);
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	2827 set(e, begin);
73 11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	2828 }
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	2829 return e;
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	2830 }
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	2831
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	2832 Expression parseXorExpression()
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	2833 {
486 bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	2834 alias parseAndExpression parseNext;
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	2835 auto begin = token;
73 11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	2836 auto e = parseNext();
223 043722eed46e - Fix: if-statements should be while-statements. aziz parents: 222 diff changeset	2837 while (token.type == T.Xor)
73 11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	2838 {
251 67a798459532 - Added parameter Token* tok to some Expression constructors. Adapted parser accordingly. aziz parents: 250 diff changeset	2839 auto tok = token;
73 11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	2840 nT();
251 67a798459532 - Added parameter Token* tok to some Expression constructors. Adapted parser accordingly. aziz parents: 250 diff changeset	2841 e = new XorExpression(e, parseNext(), tok);
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	2842 set(e, begin);
73 11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	2843 }
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	2844 return e;
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	2845 }
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	2846
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	2847 Expression parseAndExpression()
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	2848 {
486 bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	2849 alias parseCmpExpression parseNext;
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	2850 auto begin = token;
73 11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	2851 auto e = parseNext();
223 043722eed46e - Fix: if-statements should be while-statements. aziz parents: 222 diff changeset	2852 while (token.type == T.AndBinary)
73 11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	2853 {
251 67a798459532 - Added parameter Token* tok to some Expression constructors. Adapted parser accordingly. aziz parents: 250 diff changeset	2854 auto tok = token;
73 11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	2855 nT();
251 67a798459532 - Added parameter Token* tok to some Expression constructors. Adapted parser accordingly. aziz parents: 250 diff changeset	2856 e = new AndExpression(e, parseNext(), tok);
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	2857 set(e, begin);
73 11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	2858 }
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	2859 return e;
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	2860 }
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	2861
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	2862 Expression parseCmpExpression()
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions. aziz parents: 72 diff changeset	2863 {
486 bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	2864 alias parseShiftExpression parseNext;
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	2865 auto begin = token;
74 30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	2866 auto e = parseShiftExpression();
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	2867
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	2868 auto operator = token;
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	2869 switch (operator.type)
74 30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	2870 {
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	2871 case T.Equal, T.NotEqual:
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	2872 nT();
486 bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	2873 e = new EqualExpression(e, parseNext(), operator);
74 30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	2874 break;
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	2875 case T.Not:
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	2876 if (peekNext() != T.Is)
74 30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	2877 break;
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	2878 nT();
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	2879 // fall through
225 8883c113c2f1 - Fix: case T.Identity should be T.Is. aziz parents: 224 diff changeset	2880 case T.Is:
74 30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	2881 nT();
486 bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	2882 e = new IdentityExpression(e, parseNext(), operator);
74 30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	2883 break;
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	2884 case T.LessEqual, T.Less, T.GreaterEqual, T.Greater,
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	2885 T.Unordered, T.UorE, T.UorG, T.UorGorE,
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	2886 T.UorL, T.UorLorE, T.LorEorG, T.LorG:
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	2887 nT();
486 bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	2888 e = new RelExpression(e, parseNext(), operator);
74 30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	2889 break;
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	2890 case T.In:
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	2891 nT();
486 bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	2892 e = new InExpression(e, parseNext(), operator);
74 30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	2893 break;
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	2894 default:
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	2895 return e;
74 30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	2896 }
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	2897 set(e, begin);
74 30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	2898 return e;
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	2899 }
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	2900
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	2901 Expression parseShiftExpression()
30b0fb85dda9 - Implemented parseCmpExpression(). aziz parents: 73 diff changeset	2902 {
486 bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	2903 alias parseAddExpression parseNext;
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	2904 auto begin = token;
486 bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	2905 auto e = parseNext();
75 3f976d9e0833 - Implemented parseShiftExpression(). aziz parents: 74 diff changeset	2906 while (1)
3f976d9e0833 - Implemented parseShiftExpression(). aziz parents: 74 diff changeset	2907 {
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	2908 auto operator = token;
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	2909 switch (operator.type)
75 3f976d9e0833 - Implemented parseShiftExpression(). aziz parents: 74 diff changeset	2910 {
486 bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	2911 case T.LShift: nT(); e = new LShiftExpression(e, parseNext(), operator); break;
bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	2912 case T.RShift: nT(); e = new RShiftExpression(e, parseNext(), operator); break;
bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	2913 case T.URShift: nT(); e = new URShiftExpression(e, parseNext(), operator); break;
228 a4c5ee9527b7 - Replaced assert(0); with break; in case T.Static. Renamed local t to next. aziz parents: 227 diff changeset	2914 default:
a4c5ee9527b7 - Replaced assert(0); with break; in case T.Static. Renamed local t to next. aziz parents: 227 diff changeset	2915 return e;
75 3f976d9e0833 - Implemented parseShiftExpression(). aziz parents: 74 diff changeset	2916 }
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	2917 set(e, begin);
75 3f976d9e0833 - Implemented parseShiftExpression(). aziz parents: 74 diff changeset	2918 }
228 a4c5ee9527b7 - Replaced assert(0); with break; in case T.Static. Renamed local t to next. aziz parents: 227 diff changeset	2919 assert(0);
75 3f976d9e0833 - Implemented parseShiftExpression(). aziz parents: 74 diff changeset	2920 }
3f976d9e0833 - Implemented parseShiftExpression(). aziz parents: 74 diff changeset	2921
3f976d9e0833 - Implemented parseShiftExpression(). aziz parents: 74 diff changeset	2922 Expression parseAddExpression()
3f976d9e0833 - Implemented parseShiftExpression(). aziz parents: 74 diff changeset	2923 {
486 bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	2924 alias parseMulExpression parseNext;
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	2925 auto begin = token;
486 bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	2926 auto e = parseNext();
76 a85f9edf6ce7 - Implemented parseAddExpression(). aziz parents: 75 diff changeset	2927 while (1)
a85f9edf6ce7 - Implemented parseAddExpression(). aziz parents: 75 diff changeset	2928 {
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	2929 auto operator = token;
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	2930 switch (operator.type)
76 a85f9edf6ce7 - Implemented parseAddExpression(). aziz parents: 75 diff changeset	2931 {
486 bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	2932 case T.Plus: nT(); e = new PlusExpression(e, parseNext(), operator); break;
bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	2933 case T.Minus: nT(); e = new MinusExpression(e, parseNext(), operator); break;
bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	2934 case T.Tilde: nT(); e = new CatExpression(e, parseNext(), operator); break;
228 a4c5ee9527b7 - Replaced assert(0); with break; in case T.Static. Renamed local t to next. aziz parents: 227 diff changeset	2935 default:
a4c5ee9527b7 - Replaced assert(0); with break; in case T.Static. Renamed local t to next. aziz parents: 227 diff changeset	2936 return e;
76 a85f9edf6ce7 - Implemented parseAddExpression(). aziz parents: 75 diff changeset	2937 }
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	2938 set(e, begin);
76 a85f9edf6ce7 - Implemented parseAddExpression(). aziz parents: 75 diff changeset	2939 }
228 a4c5ee9527b7 - Replaced assert(0); with break; in case T.Static. Renamed local t to next. aziz parents: 227 diff changeset	2940 assert(0);
76 a85f9edf6ce7 - Implemented parseAddExpression(). aziz parents: 75 diff changeset	2941 }
a85f9edf6ce7 - Implemented parseAddExpression(). aziz parents: 75 diff changeset	2942
a85f9edf6ce7 - Implemented parseAddExpression(). aziz parents: 75 diff changeset	2943 Expression parseMulExpression()
a85f9edf6ce7 - Implemented parseAddExpression(). aziz parents: 75 diff changeset	2944 {
335 b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	2945 alias parsePostExpression parseNext;
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	2946 auto begin = token;
335 b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	2947 auto e = parseNext();
77 7e21c4df1c02 - Implemented parseMulExpression(). aziz parents: 76 diff changeset	2948 while (1)
7e21c4df1c02 - Implemented parseMulExpression(). aziz parents: 76 diff changeset	2949 {
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	2950 auto operator = token;
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	2951 switch (operator.type)
77 7e21c4df1c02 - Implemented parseMulExpression(). aziz parents: 76 diff changeset	2952 {
335 b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	2953 case T.Mul: nT(); e = new MulExpression(e, parseNext(), operator); break;
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	2954 case T.Div: nT(); e = new DivExpression(e, parseNext(), operator); break;
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	2955 case T.Mod: nT(); e = new ModExpression(e, parseNext(), operator); break;
228 a4c5ee9527b7 - Replaced assert(0); with break; in case T.Static. Renamed local t to next. aziz parents: 227 diff changeset	2956 default:
a4c5ee9527b7 - Replaced assert(0); with break; in case T.Static. Renamed local t to next. aziz parents: 227 diff changeset	2957 return e;
77 7e21c4df1c02 - Implemented parseMulExpression(). aziz parents: 76 diff changeset	2958 }
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	2959 set(e, begin);
77 7e21c4df1c02 - Implemented parseMulExpression(). aziz parents: 76 diff changeset	2960 }
228 a4c5ee9527b7 - Replaced assert(0); with break; in case T.Static. Renamed local t to next. aziz parents: 227 diff changeset	2961 assert(0);
71 b3777cca323c - Added Identity and NotIdentity tokens. aziz parents: 70 diff changeset	2962 }
b3777cca323c - Added Identity and NotIdentity tokens. aziz parents: 70 diff changeset	2963
335 b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	2964 Expression parsePostExpression()
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	2965 {
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	2966 auto begin = token;
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	2967 auto e = parseUnaryExpression();
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	2968 while (1)
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	2969 {
618 07946b379006 Refactored the way dot expressions are parsed. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 616 diff changeset	2970 while (skipped(T.Dot))
07946b379006 Refactored the way dot expressions are parsed. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 616 diff changeset	2971 {
07946b379006 Refactored the way dot expressions are parsed. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 616 diff changeset	2972 e = new DotExpression(e, parseNewOrIdentifierExpression());
07946b379006 Refactored the way dot expressions are parsed. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 616 diff changeset	2973 set(e, begin);
07946b379006 Refactored the way dot expressions are parsed. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 616 diff changeset	2974 }
07946b379006 Refactored the way dot expressions are parsed. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 616 diff changeset	2975
335 b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	2976 switch (token.type)
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	2977 {
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	2978 case T.PlusPlus:
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	2979 e = new PostIncrExpression(e);
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	2980 break;
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	2981 case T.MinusMinus:
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	2982 e = new PostDecrExpression(e);
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	2983 break;
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	2984 case T.LParen:
486 bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	2985 e = new CallExpression(e, parseArguments());
335 b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	2986 goto Lset;
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	2987 case T.LBracket:
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	2988 // parse Slice- and IndexExpression
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	2989 nT();
489 a7291d3ee9d7 Refactored classes that inherit from Node. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 488 diff changeset	2990 // [] is a SliceExpression
335 b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	2991 if (token.type == T.RBracket)
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	2992 {
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	2993 e = new SliceExpression(e, null, null);
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	2994 break;
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	2995 }
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	2996
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	2997 Expression[] es = [parseAssignExpression()];
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	2998
489 a7291d3ee9d7 Refactored classes that inherit from Node. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 488 diff changeset	2999 // [ AssignExpression .. AssignExpression ]
531 315aeb3f7a9b Added method skipped() to dil.Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 530 diff changeset	3000 if (skipped(T.Slice))
335 b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3001 {
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3002 e = new SliceExpression(e, es[0], parseAssignExpression());
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3003 require(T.RBracket);
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3004 goto Lset;
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3005 }
486 bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	3006
489 a7291d3ee9d7 Refactored classes that inherit from Node. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 488 diff changeset	3007 // [ ExpressionList ]
531 315aeb3f7a9b Added method skipped() to dil.Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 530 diff changeset	3008 if (skipped(T.Comma))
486 bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	3009 es ~= parseExpressionList();
bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	3010 require(T.RBracket);
335 b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3011
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3012 e = new IndexExpression(e, es);
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3013 goto Lset;
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3014 default:
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3015 return e;
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3016 }
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3017 nT();
489 a7291d3ee9d7 Refactored classes that inherit from Node. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 488 diff changeset	3018 Lset: // Jumped here to skip nT().
335 b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3019 set(e, begin);
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3020 }
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3021 assert(0);
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3022 }
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3023
91 ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3024 Expression parseUnaryExpression()
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3025 {
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3026 auto begin = token;
91 ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3027 Expression e;
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3028 switch (token.type)
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3029 {
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3030 case T.AndBinary:
257 6c58366ba1eb - Fix: need to allocate Parameters. aziz parents: 256 diff changeset	3031 nT();
243 461e544ebb53 - Added method requireId(). aziz parents: 242 diff changeset	3032 e = new AddressExpression(parseUnaryExpression());
91 ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3033 break;
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3034 case T.PlusPlus:
257 6c58366ba1eb - Fix: need to allocate Parameters. aziz parents: 256 diff changeset	3035 nT();
243 461e544ebb53 - Added method requireId(). aziz parents: 242 diff changeset	3036 e = new PreIncrExpression(parseUnaryExpression());
91 ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3037 break;
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3038 case T.MinusMinus:
257 6c58366ba1eb - Fix: need to allocate Parameters. aziz parents: 256 diff changeset	3039 nT();
243 461e544ebb53 - Added method requireId(). aziz parents: 242 diff changeset	3040 e = new PreDecrExpression(parseUnaryExpression());
91 ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3041 break;
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3042 case T.Mul:
257 6c58366ba1eb - Fix: need to allocate Parameters. aziz parents: 256 diff changeset	3043 nT();
243 461e544ebb53 - Added method requireId(). aziz parents: 242 diff changeset	3044 e = new DerefExpression(parseUnaryExpression());
91 ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3045 break;
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3046 case T.Minus:
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3047 case T.Plus:
257 6c58366ba1eb - Fix: need to allocate Parameters. aziz parents: 256 diff changeset	3048 nT();
243 461e544ebb53 - Added method requireId(). aziz parents: 242 diff changeset	3049 e = new SignExpression(parseUnaryExpression());
91 ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3050 break;
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3051 case T.Not:
257 6c58366ba1eb - Fix: need to allocate Parameters. aziz parents: 256 diff changeset	3052 nT();
243 461e544ebb53 - Added method requireId(). aziz parents: 242 diff changeset	3053 e = new NotExpression(parseUnaryExpression());
91 ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3054 break;
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3055 case T.Tilde:
257 6c58366ba1eb - Fix: need to allocate Parameters. aziz parents: 256 diff changeset	3056 nT();
243 461e544ebb53 - Added method requireId(). aziz parents: 242 diff changeset	3057 e = new CompExpression(parseUnaryExpression());
91 ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3058 break;
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3059 case T.New:
154 0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	3060 e = parseNewExpression();
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3061 return e;
91 ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3062 case T.Delete:
257 6c58366ba1eb - Fix: need to allocate Parameters. aziz parents: 256 diff changeset	3063 nT();
243 461e544ebb53 - Added method requireId(). aziz parents: 242 diff changeset	3064 e = new DeleteExpression(parseUnaryExpression());
91 ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3065 break;
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3066 case T.Cast:
99 6b8c248f5911 - Added member type to classes CastExpression and TypeidExpression. aziz parents: 98 diff changeset	3067 requireNext(T.LParen);
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3068 Type type;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3069 switch (token.type)
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3070 {
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3071 version(D2)
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3072 {
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3073 auto begin2 = token;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3074 case T.Const:
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3075 type = new ConstType(null);
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3076 goto case_break;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3077 case T.Invariant:
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3078 type = new InvariantType(null);
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3079 case_break:
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3080 nT();
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3081 set(type, begin2);
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3082 break;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3083 }
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3084 default:
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3085 type = parseType();
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3086 }
99 6b8c248f5911 - Added member type to classes CastExpression and TypeidExpression. aziz parents: 98 diff changeset	3087 require(T.RParen);
6b8c248f5911 - Added member type to classes CastExpression and TypeidExpression. aziz parents: 98 diff changeset	3088 e = new CastExpression(parseUnaryExpression(), type);
257 6c58366ba1eb - Fix: need to allocate Parameters. aziz parents: 256 diff changeset	3089 break;
91 ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3090 case T.LParen:
102 6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	3091 // ( Type ) . Identifier
225 8883c113c2f1 - Fix: case T.Identity should be T.Is. aziz parents: 224 diff changeset	3092 Type parseType_()
8883c113c2f1 - Fix: case T.Identity should be T.Is. aziz parents: 224 diff changeset	3093 {
8883c113c2f1 - Fix: case T.Identity should be T.Is. aziz parents: 224 diff changeset	3094 nT();
8883c113c2f1 - Fix: case T.Identity should be T.Is. aziz parents: 224 diff changeset	3095 auto type = parseType();
8883c113c2f1 - Fix: case T.Identity should be T.Is. aziz parents: 224 diff changeset	3096 require(T.RParen);
233 c2b601dcd57d - Added assert to parseDotListExpression(). aziz parents: 232 diff changeset	3097 require(T.Dot);
225 8883c113c2f1 - Fix: case T.Identity should be T.Is. aziz parents: 224 diff changeset	3098 return type;
8883c113c2f1 - Fix: case T.Identity should be T.Is. aziz parents: 224 diff changeset	3099 }
8883c113c2f1 - Fix: case T.Identity should be T.Is. aziz parents: 224 diff changeset	3100 bool success;
423 6057113f9a44 Refactored Parser.try_(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 422 diff changeset	3101 auto type = try_(&parseType_, success);
225 8883c113c2f1 - Fix: case T.Identity should be T.Is. aziz parents: 224 diff changeset	3102 if (success)
8883c113c2f1 - Fix: case T.Identity should be T.Is. aziz parents: 224 diff changeset	3103 {
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	3104 auto ident = requireIdentifier(MSG.ExpectedIdAfterTypeDot);
225 8883c113c2f1 - Fix: case T.Identity should be T.Is. aziz parents: 224 diff changeset	3105 e = new TypeDotIdExpression(type, ident);
257 6c58366ba1eb - Fix: need to allocate Parameters. aziz parents: 256 diff changeset	3106 break;
225 8883c113c2f1 - Fix: case T.Identity should be T.Is. aziz parents: 224 diff changeset	3107 }
8883c113c2f1 - Fix: case T.Identity should be T.Is. aziz parents: 224 diff changeset	3108 goto default;
618 07946b379006 Refactored the way dot expressions are parsed. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 616 diff changeset	3109 case T.Dot:
07946b379006 Refactored the way dot expressions are parsed. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 616 diff changeset	3110 nT();
07946b379006 Refactored the way dot expressions are parsed. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 616 diff changeset	3111 e = new ModuleScopeExpression(parseIdentifierExpression());
07946b379006 Refactored the way dot expressions are parsed. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 616 diff changeset	3112 break;
91 ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3113 default:
335 b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression(). aziz parents: 327 diff changeset	3114 e = parsePrimaryExpression();
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3115 return e;
91 ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3116 }
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3117 assert(e !is null);
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3118 set(e, begin);
91 ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3119 return e;
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3120 }
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list. aziz parents: 90 diff changeset	3121
618 07946b379006 Refactored the way dot expressions are parsed. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 616 diff changeset	3122 /++
07946b379006 Refactored the way dot expressions are parsed. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 616 diff changeset	3123 IdentifierExpression:
07946b379006 Refactored the way dot expressions are parsed. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 616 diff changeset	3124 Identifier
07946b379006 Refactored the way dot expressions are parsed. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 616 diff changeset	3125 TemplateInstance
07946b379006 Refactored the way dot expressions are parsed. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 616 diff changeset	3126 TemplateInstance:
07946b379006 Refactored the way dot expressions are parsed. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 616 diff changeset	3127 Identifier !( TemplateArguments )
07946b379006 Refactored the way dot expressions are parsed. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 616 diff changeset	3128 +/
07946b379006 Refactored the way dot expressions are parsed. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 616 diff changeset	3129 Expression parseIdentifierExpression()
07946b379006 Refactored the way dot expressions are parsed. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 616 diff changeset	3130 {
07946b379006 Refactored the way dot expressions are parsed. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 616 diff changeset	3131 auto begin = token;
07946b379006 Refactored the way dot expressions are parsed. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 616 diff changeset	3132 auto ident = requireIdentifier(MSG.ExpectedAnIdentifier);
07946b379006 Refactored the way dot expressions are parsed. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 616 diff changeset	3133 Expression e;
634 14e99ce74d06 Fixed parsing of TemplateInstanceExpressions. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 632 diff changeset	3134 // Peek for '(' to avoid matching: id !is id
14e99ce74d06 Fixed parsing of TemplateInstanceExpressions. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 632 diff changeset	3135 if (token.type == T.Not && peekNext() == T.LParen)
618 07946b379006 Refactored the way dot expressions are parsed. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 616 diff changeset	3136 { // Identifier !( TemplateArguments )
07946b379006 Refactored the way dot expressions are parsed. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 616 diff changeset	3137 nT(); // Skip !.
07946b379006 Refactored the way dot expressions are parsed. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 616 diff changeset	3138 auto tparams = parseTemplateArguments();
07946b379006 Refactored the way dot expressions are parsed. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 616 diff changeset	3139 e = new TemplateInstanceExpression(ident, tparams);
07946b379006 Refactored the way dot expressions are parsed. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 616 diff changeset	3140 }
07946b379006 Refactored the way dot expressions are parsed. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 616 diff changeset	3141 else // Identifier
07946b379006 Refactored the way dot expressions are parsed. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 616 diff changeset	3142 e = new IdentifierExpression(ident);
07946b379006 Refactored the way dot expressions are parsed. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 616 diff changeset	3143 return set(e, begin);
07946b379006 Refactored the way dot expressions are parsed. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 616 diff changeset	3144 }
07946b379006 Refactored the way dot expressions are parsed. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 616 diff changeset	3145
07946b379006 Refactored the way dot expressions are parsed. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 616 diff changeset	3146 Expression parseNewOrIdentifierExpression()
07946b379006 Refactored the way dot expressions are parsed. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 616 diff changeset	3147 {
07946b379006 Refactored the way dot expressions are parsed. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 616 diff changeset	3148 return token.type == T.New ? parseNewExpression() : parseIdentifierExpression();
07946b379006 Refactored the way dot expressions are parsed. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 616 diff changeset	3149 }
07946b379006 Refactored the way dot expressions are parsed. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 616 diff changeset	3150
79 df4e5c7ad58a - Implemented most of parsePostExpression() and parsePreExpression(). aziz parents: 78 diff changeset	3151 Expression parsePrimaryExpression()
78 f043759fb59a - Added code to parseUnaryExpression(); not fully implemented. aziz parents: 77 diff changeset	3152 {
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3153 auto begin = token;
83 9e6d66f647c9 - Fix: IsExpression was created instead of IdentityExpression. aziz parents: 81 diff changeset	3154 Expression e;
87 c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	3155 switch (token.type)
83 9e6d66f647c9 - Fix: IsExpression was created instead of IdentityExpression. aziz parents: 81 diff changeset	3156 {
618 07946b379006 Refactored the way dot expressions are parsed. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 616 diff changeset	3157 case T.Identifier:
07946b379006 Refactored the way dot expressions are parsed. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 616 diff changeset	3158 e = parseIdentifierExpression();
07946b379006 Refactored the way dot expressions are parsed. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 616 diff changeset	3159 return e;
07946b379006 Refactored the way dot expressions are parsed. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 616 diff changeset	3160 case T.Typeof:
07946b379006 Refactored the way dot expressions are parsed. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 616 diff changeset	3161 e = new TypeofExpression(parseTypeofType());
154 0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	3162 break;
84 ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3163 case T.This:
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3164 nT();
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3165 e = new ThisExpression();
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3166 break;
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3167 case T.Super:
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3168 nT();
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3169 e = new SuperExpression();
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3170 break;
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3171 case T.Null:
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3172 nT();
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3173 e = new NullExpression();
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3174 break;
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3175 case T.True, T.False:
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3176 nT();
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3177 e = new BoolExpression();
84 ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3178 break;
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3179 case T.Dollar:
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3180 nT();
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3181 e = new DollarExpression();
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3182 break;
97 1a83e5070a84 - Added code for parsing IntNumber- and RealNumberExpressions. aziz parents: 96 diff changeset	3183 case T.Int32, T.Int64, T.Uint32, T.Uint64:
537 db7913148b29 Added constructors and semantic() methods. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 536 diff changeset	3184 e = new IntExpression(token);
97 1a83e5070a84 - Added code for parsing IntNumber- and RealNumberExpressions. aziz parents: 96 diff changeset	3185 nT();
1a83e5070a84 - Added code for parsing IntNumber- and RealNumberExpressions. aziz parents: 96 diff changeset	3186 break;
1a83e5070a84 - Added code for parsing IntNumber- and RealNumberExpressions. aziz parents: 96 diff changeset	3187 case T.Float32, T.Float64, T.Float80,
1a83e5070a84 - Added code for parsing IntNumber- and RealNumberExpressions. aziz parents: 96 diff changeset	3188 T.Imaginary32, T.Imaginary64, T.Imaginary80:
539 3418027c3914 Added semantic() method to RealExpression. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 537 diff changeset	3189 e = new RealExpression(token);
97 1a83e5070a84 - Added code for parsing IntNumber- and RealNumberExpressions. aziz parents: 96 diff changeset	3190 nT();
84 ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3191 break;
507 996041463028 Removed TOK.WCharLiteral and TOK.DCharLiteral. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 505 diff changeset	3192 case T.CharLiteral:
536 0781ac288537 Added some semantic() methods. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 535 diff changeset	3193 e = new CharExpression(token.dchar_);
84 ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3194 nT();
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3195 break;
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3196 case T.String:
653 29cc5bf3ce89 Refactored StringExpression. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 650 diff changeset	3197 char[] str = token.str;
29cc5bf3ce89 Refactored StringExpression. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 650 diff changeset	3198 char postfix = token.pf;
29cc5bf3ce89 Refactored StringExpression. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 650 diff changeset	3199 nT();
29cc5bf3ce89 Refactored StringExpression. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 650 diff changeset	3200 while (token.type == T.String)
84 ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3201 {
653 29cc5bf3ce89 Refactored StringExpression. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 650 diff changeset	3202 if (postfix == '\0')
29cc5bf3ce89 Refactored StringExpression. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 650 diff changeset	3203 postfix = token.pf;
29cc5bf3ce89 Refactored StringExpression. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 650 diff changeset	3204 else if (token.pf && token.pf != postfix)
29cc5bf3ce89 Refactored StringExpression. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 650 diff changeset	3205 error(token, MSG.StringPostfixMismatch);
29cc5bf3ce89 Refactored StringExpression. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 650 diff changeset	3206 str ~= token.str;
84 ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3207 nT();
653 29cc5bf3ce89 Refactored StringExpression. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 650 diff changeset	3208 }
29cc5bf3ce89 Refactored StringExpression. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 650 diff changeset	3209 switch (postfix)
29cc5bf3ce89 Refactored StringExpression. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 650 diff changeset	3210 { // TODO: convert string
29cc5bf3ce89 Refactored StringExpression. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 650 diff changeset	3211 case 'w': e = new StringExpression(/+toUTF16+/(str)); break;
29cc5bf3ce89 Refactored StringExpression. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 650 diff changeset	3212 case 'd': e = new StringExpression(/+toUTF32+/(str)); break;
29cc5bf3ce89 Refactored StringExpression. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 650 diff changeset	3213 case 'c':
29cc5bf3ce89 Refactored StringExpression. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 650 diff changeset	3214 default: e = new StringExpression(str); break;
29cc5bf3ce89 Refactored StringExpression. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 650 diff changeset	3215 }
84 ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3216 break;
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3217 case T.LBracket:
85 d8dc3171440d - Fixed parsing CallExpression and IndexExpression. aziz parents: 84 diff changeset	3218 Expression[] values;
d8dc3171440d - Fixed parsing CallExpression and IndexExpression. aziz parents: 84 diff changeset	3219
d8dc3171440d - Fixed parsing CallExpression and IndexExpression. aziz parents: 84 diff changeset	3220 nT();
531 315aeb3f7a9b Added method skipped() to dil.Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 530 diff changeset	3221 if (!skipped(T.RBracket))
85 d8dc3171440d - Fixed parsing CallExpression and IndexExpression. aziz parents: 84 diff changeset	3222 {
d8dc3171440d - Fixed parsing CallExpression and IndexExpression. aziz parents: 84 diff changeset	3223 e = parseAssignExpression();
87 c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	3224 if (token.type == T.Colon)
85 d8dc3171440d - Fixed parsing CallExpression and IndexExpression. aziz parents: 84 diff changeset	3225 goto LparseAssocArray;
531 315aeb3f7a9b Added method skipped() to dil.Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 530 diff changeset	3226 if (skipped(T.Comma))
486 bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	3227 values = [e] ~ parseExpressionList();
bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	3228 require(T.RBracket);
85 d8dc3171440d - Fixed parsing CallExpression and IndexExpression. aziz parents: 84 diff changeset	3229 }
d8dc3171440d - Fixed parsing CallExpression and IndexExpression. aziz parents: 84 diff changeset	3230
d8dc3171440d - Fixed parsing CallExpression and IndexExpression. aziz parents: 84 diff changeset	3231 e = new ArrayLiteralExpression(values);
d8dc3171440d - Fixed parsing CallExpression and IndexExpression. aziz parents: 84 diff changeset	3232 break;
d8dc3171440d - Fixed parsing CallExpression and IndexExpression. aziz parents: 84 diff changeset	3233
d8dc3171440d - Fixed parsing CallExpression and IndexExpression. aziz parents: 84 diff changeset	3234 LparseAssocArray:
d8dc3171440d - Fixed parsing CallExpression and IndexExpression. aziz parents: 84 diff changeset	3235 Expression[] keys;
d8dc3171440d - Fixed parsing CallExpression and IndexExpression. aziz parents: 84 diff changeset	3236
d8dc3171440d - Fixed parsing CallExpression and IndexExpression. aziz parents: 84 diff changeset	3237 keys ~= e;
d8dc3171440d - Fixed parsing CallExpression and IndexExpression. aziz parents: 84 diff changeset	3238 nT(); // Skip colon.
271 68987c1c59b6 - Fixed parsing empty ArrayLiteralExpression. Needed to skip T.RBracket. aziz parents: 270 diff changeset	3239 goto LenterLoop;
68987c1c59b6 - Fixed parsing empty ArrayLiteralExpression. Needed to skip T.RBracket. aziz parents: 270 diff changeset	3240
68987c1c59b6 - Fixed parsing empty ArrayLiteralExpression. Needed to skip T.RBracket. aziz parents: 270 diff changeset	3241 while (1)
88 81cb24669ed3 - Fixed parser of AssocArrayLiteralExpression. aziz parents: 87 diff changeset	3242 {
271 68987c1c59b6 - Fixed parsing empty ArrayLiteralExpression. Needed to skip T.RBracket. aziz parents: 270 diff changeset	3243 keys ~= parseAssignExpression();
68987c1c59b6 - Fixed parsing empty ArrayLiteralExpression. Needed to skip T.RBracket. aziz parents: 270 diff changeset	3244 require(T.Colon);
68987c1c59b6 - Fixed parsing empty ArrayLiteralExpression. Needed to skip T.RBracket. aziz parents: 270 diff changeset	3245 LenterLoop:
68987c1c59b6 - Fixed parsing empty ArrayLiteralExpression. Needed to skip T.RBracket. aziz parents: 270 diff changeset	3246 values ~= parseAssignExpression();
68987c1c59b6 - Fixed parsing empty ArrayLiteralExpression. Needed to skip T.RBracket. aziz parents: 270 diff changeset	3247 if (token.type != T.Comma)
68987c1c59b6 - Fixed parsing empty ArrayLiteralExpression. Needed to skip T.RBracket. aziz parents: 270 diff changeset	3248 break;
68987c1c59b6 - Fixed parsing empty ArrayLiteralExpression. Needed to skip T.RBracket. aziz parents: 270 diff changeset	3249 nT();
88 81cb24669ed3 - Fixed parser of AssocArrayLiteralExpression. aziz parents: 87 diff changeset	3250 }
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3251 require(T.RBracket);
399 ff1d11c27061 Renamed some Expression classes. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 398 diff changeset	3252 e = new AArrayLiteralExpression(keys, values);
84 ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3253 break;
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3254 case T.LBrace:
193 2a2975b6d539 - Using parseFunctionBody() when parsing FunctionLiteralExpression. aziz parents: 192 diff changeset	3255 // DelegateLiteral := { Statements }
267 f3dfa6208ed3 - Removed parameter func from parseFunctionBody(). Creating new FunctionBody inside the method. aziz parents: 266 diff changeset	3256 auto funcBody = parseFunctionBody();
289 a99357783c6f - Fix: assign targs to member targs of TraitsExpression. aziz parents: 288 diff changeset	3257 e = new FunctionLiteralExpression(funcBody);
84 ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3258 break;
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3259 case T.Function, T.Delegate:
193 2a2975b6d539 - Using parseFunctionBody() when parsing FunctionLiteralExpression. aziz parents: 192 diff changeset	3260 // FunctionLiteral := (function\|delegate) Type? '(' ArgumentList ')' '{' Statements '}'
133 3924b1ee1302 - Added code for parsing function and delegate literal expressions. aziz parents: 132 diff changeset	3261 nT(); // Skip function\|delegate token.
3924b1ee1302 - Added code for parsing function and delegate literal expressions. aziz parents: 132 diff changeset	3262 Type returnType;
3924b1ee1302 - Added code for parsing function and delegate literal expressions. aziz parents: 132 diff changeset	3263 Parameters parameters;
3924b1ee1302 - Added code for parsing function and delegate literal expressions. aziz parents: 132 diff changeset	3264 if (token.type != T.LBrace)
3924b1ee1302 - Added code for parsing function and delegate literal expressions. aziz parents: 132 diff changeset	3265 {
3924b1ee1302 - Added code for parsing function and delegate literal expressions. aziz parents: 132 diff changeset	3266 if (token.type != T.LParen) // Optional return type
3924b1ee1302 - Added code for parsing function and delegate literal expressions. aziz parents: 132 diff changeset	3267 returnType = parseType();
143 e760d7552f66 - Renamed parseArgumentList() to parseArguments(). aziz parents: 141 diff changeset	3268 parameters = parseParameterList();
133 3924b1ee1302 - Added code for parsing function and delegate literal expressions. aziz parents: 132 diff changeset	3269 }
267 f3dfa6208ed3 - Removed parameter func from parseFunctionBody(). Creating new FunctionBody inside the method. aziz parents: 266 diff changeset	3270 auto funcBody = parseFunctionBody();
289 a99357783c6f - Fix: assign targs to member targs of TraitsExpression. aziz parents: 288 diff changeset	3271 e = new FunctionLiteralExpression(returnType, parameters, funcBody);
84 ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3272 break;
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3273 case T.Assert:
86 0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	3274 Expression msg;
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	3275 requireNext(T.LParen);
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	3276 e = parseAssignExpression();
531 315aeb3f7a9b Added method skipped() to dil.Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 530 diff changeset	3277 if (skipped(T.Comma))
86 0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	3278 msg = parseAssignExpression();
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	3279 require(T.RParen);
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	3280 e = new AssertExpression(e, msg);
84 ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3281 break;
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3282 case T.Mixin:
86 0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	3283 requireNext(T.LParen);
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	3284 e = parseAssignExpression();
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	3285 require(T.RParen);
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	3286 e = new MixinExpression(e);
84 ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3287 break;
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3288 case T.Import:
86 0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	3289 requireNext(T.LParen);
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	3290 e = parseAssignExpression();
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	3291 require(T.RParen);
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	3292 e = new ImportExpression(e);
84 ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3293 break;
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3294 case T.Typeid:
86 0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	3295 requireNext(T.LParen);
99 6b8c248f5911 - Added member type to classes CastExpression and TypeidExpression. aziz parents: 98 diff changeset	3296 auto type = parseType();
6b8c248f5911 - Added member type to classes CastExpression and TypeidExpression. aziz parents: 98 diff changeset	3297 require(T.RParen);
6b8c248f5911 - Added member type to classes CastExpression and TypeidExpression. aziz parents: 98 diff changeset	3298 e = new TypeidExpression(type);
84 ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3299 break;
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3300 case T.Is:
100 538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	3301 requireNext(T.LParen);
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	3302
248 63a15b082c0c - Removed class SpecializationType. aziz parents: 247 diff changeset	3303 Type type, specType;
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	3304 Identifier* ident; // optional Identifier
248 63a15b082c0c - Removed class SpecializationType. aziz parents: 247 diff changeset	3305 Token* opTok, specTok;
100 538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	3306
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	3307 type = parseDeclarator(ident, true);
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	3308
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	3309 switch (token.type)
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	3310 {
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	3311 case T.Colon, T.Equal:
248 63a15b082c0c - Removed class SpecializationType. aziz parents: 247 diff changeset	3312 opTok = token;
100 538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	3313 nT();
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	3314 switch (token.type)
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	3315 {
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	3316 case T.Typedef,
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	3317 T.Struct,
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	3318 T.Union,
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	3319 T.Class,
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	3320 T.Interface,
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	3321 T.Enum,
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	3322 T.Function,
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	3323 T.Delegate,
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	3324 T.Super,
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	3325 T.Return:
493 d13502b6fa5f Added code to the Parser and edited main.wiki. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 492 diff changeset	3326 case_Const_Invariant:
248 63a15b082c0c - Removed class SpecializationType. aziz parents: 247 diff changeset	3327 specTok = token;
102 6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	3328 nT();
100 538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	3329 break;
493 d13502b6fa5f Added code to the Parser and edited main.wiki. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 492 diff changeset	3330 case T.Const, T.Invariant:
d13502b6fa5f Added code to the Parser and edited main.wiki. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 492 diff changeset	3331 if (peekNext() != T.LParen)
d13502b6fa5f Added code to the Parser and edited main.wiki. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 492 diff changeset	3332 goto case_Const_Invariant;
d13502b6fa5f Added code to the Parser and edited main.wiki. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 492 diff changeset	3333 // Fall through. It's a type.
100 538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	3334 default:
248 63a15b082c0c - Removed class SpecializationType. aziz parents: 247 diff changeset	3335 specType = parseType();
100 538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	3336 }
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	3337 default:
538e8b546669 - Added code for parsing IsExpressions. aziz parents: 99 diff changeset	3338 }
377 906599374b69 - Added tparams member to IsExpression. aziz parents: 376 diff changeset	3339
906599374b69 - Added tparams member to IsExpression. aziz parents: 376 diff changeset	3340 TemplateParameters tparams;
906599374b69 - Added tparams member to IsExpression. aziz parents: 376 diff changeset	3341 version(D2)
906599374b69 - Added tparams member to IsExpression. aziz parents: 376 diff changeset	3342 {
906599374b69 - Added tparams member to IsExpression. aziz parents: 376 diff changeset	3343 // is ( Type Identifier : TypeSpecialization , TemplateParameterList )
906599374b69 - Added tparams member to IsExpression. aziz parents: 376 diff changeset	3344 // is ( Type Identifier == TypeSpecialization , TemplateParameterList )
906599374b69 - Added tparams member to IsExpression. aziz parents: 376 diff changeset	3345 if (ident && specType && token.type == T.Comma)
906599374b69 - Added tparams member to IsExpression. aziz parents: 376 diff changeset	3346 tparams = parseTemplateParameterList2();
906599374b69 - Added tparams member to IsExpression. aziz parents: 376 diff changeset	3347 }
102 6e8b67ae15b7 - Added modules Declarations and Statements. aziz parents: 101 diff changeset	3348 require(T.RParen);
377 906599374b69 - Added tparams member to IsExpression. aziz parents: 376 diff changeset	3349 e = new IsExpression(type, ident, opTok, specTok, specType, tparams);
84 ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3350 break;
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3351 case T.LParen:
646 68953760d569 Added class ParenExpression. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 640 diff changeset	3352 if (tokenAfterParenIs(T.LBrace)) // Check for "(...) {"
653 29cc5bf3ce89 Refactored StringExpression. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 650 diff changeset	3353 { // ( ParameterList ) FunctionBody
232 2a4e2c8ca094 - Renamed method isTemplateParameterList() to tokenAfterParenIs(). aziz parents: 231 diff changeset	3354 auto parameters = parseParameterList();
267 f3dfa6208ed3 - Removed parameter func from parseFunctionBody(). Creating new FunctionBody inside the method. aziz parents: 266 diff changeset	3355 auto funcBody = parseFunctionBody();
289 a99357783c6f - Fix: assign targs to member targs of TraitsExpression. aziz parents: 288 diff changeset	3356 e = new FunctionLiteralExpression(null, parameters, funcBody);
130 0467f01ed524 - Fix: parameters can have optional identifier. aziz parents: 129 diff changeset	3357 }
0467f01ed524 - Fix: parameters can have optional identifier. aziz parents: 129 diff changeset	3358 else
653 29cc5bf3ce89 Refactored StringExpression. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 650 diff changeset	3359 { // ( Expression )
130 0467f01ed524 - Fix: parameters can have optional identifier. aziz parents: 129 diff changeset	3360 nT();
0467f01ed524 - Fix: parameters can have optional identifier. aziz parents: 129 diff changeset	3361 e = parseExpression();
0467f01ed524 - Fix: parameters can have optional identifier. aziz parents: 129 diff changeset	3362 require(T.RParen);
646 68953760d569 Added class ParenExpression. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 640 diff changeset	3363 e = new ParenExpression(e);
130 0467f01ed524 - Fix: parameters can have optional identifier. aziz parents: 129 diff changeset	3364 }
84 ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3365 break;
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3366 version(D2)
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3367 {
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3368 case T.Traits:
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3369 nT();
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3370 require(T.LParen);
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	3371 auto id = requireIdentifier(MSG.ExpectedAnIdentifier);
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3372 TemplateArguments args;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3373 if (token.type == T.Comma)
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3374 args = parseTemplateArguments2();
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3375 else
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3376 require(T.RParen);
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3377 e = new TraitsExpression(id, args);
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3378 break;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3379 }
84 ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression. aziz parents: 83 diff changeset	3380 default:
508 943ecc9c133a Added isIntegralType() to Token and refactored code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 507 diff changeset	3381 if (token.isIntegralType)
943ecc9c133a Added isIntegralType() to Token and refactored code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 507 diff changeset	3382 { // IntegralType . Identifier
943ecc9c133a Added isIntegralType() to Token and refactored code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 507 diff changeset	3383 auto type = new IntegralType(token.type);
943ecc9c133a Added isIntegralType() to Token and refactored code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 507 diff changeset	3384 nT();
943ecc9c133a Added isIntegralType() to Token and refactored code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 507 diff changeset	3385 set(type, begin);
943ecc9c133a Added isIntegralType() to Token and refactored code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 507 diff changeset	3386 require(T.Dot);
943ecc9c133a Added isIntegralType() to Token and refactored code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 507 diff changeset	3387 auto ident = requireIdentifier(MSG.ExpectedIdAfterTypeDot);
943ecc9c133a Added isIntegralType() to Token and refactored code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 507 diff changeset	3388 e = new TypeDotIdExpression(type, ident);
943ecc9c133a Added isIntegralType() to Token and refactored code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 507 diff changeset	3389 }
943ecc9c133a Added isIntegralType() to Token and refactored code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 507 diff changeset	3390 else if (token.isSpecialToken)
343 95f1b6e43214 - Removed TOK.Special and added an own entry for each special token. aziz parents: 342 diff changeset	3391 {
95f1b6e43214 - Removed TOK.Special and added an own entry for each special token. aziz parents: 342 diff changeset	3392 e = new SpecialTokenExpression(token);
95f1b6e43214 - Removed TOK.Special and added an own entry for each special token. aziz parents: 342 diff changeset	3393 nT();
95f1b6e43214 - Removed TOK.Special and added an own entry for each special token. aziz parents: 342 diff changeset	3394 }
508 943ecc9c133a Added isIntegralType() to Token and refactored code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 507 diff changeset	3395 else
414 9c69615a4876 Added method insertEmptyTokenBefore() to Lexer. Made some fixes, too. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 409 diff changeset	3396 {
508 943ecc9c133a Added isIntegralType() to Token and refactored code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 507 diff changeset	3397 error(MID.ExpectedButFound, "Expression", token.srcText);
659 304331ca2f95 Renamed EmptyExpression to IllegalExpression. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 655 diff changeset	3398 e = new IllegalExpression();
508 943ecc9c133a Added isIntegralType() to Token and refactored code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 507 diff changeset	3399 if (!trying)
653 29cc5bf3ce89 Refactored StringExpression. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 650 diff changeset	3400 { // Insert a dummy token and don't consume current one.
619 933cd8d24467 Renamed Parser.lx to Parser.lexer. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 618 diff changeset	3401 begin = lexer.insertEmptyTokenBefore(token);
508 943ecc9c133a Added isIntegralType() to Token and refactored code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 507 diff changeset	3402 this.prevToken = begin;
943ecc9c133a Added isIntegralType() to Token and refactored code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 507 diff changeset	3403 }
414 9c69615a4876 Added method insertEmptyTokenBefore() to Lexer. Made some fixes, too. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 409 diff changeset	3404 }
83 9e6d66f647c9 - Fix: IsExpression was created instead of IdentityExpression. aziz parents: 81 diff changeset	3405 }
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3406 set(e, begin);
83 9e6d66f647c9 - Fix: IsExpression was created instead of IdentityExpression. aziz parents: 81 diff changeset	3407 return e;
77 7e21c4df1c02 - Implemented parseMulExpression(). aziz parents: 76 diff changeset	3408 }
7e21c4df1c02 - Implemented parseMulExpression(). aziz parents: 76 diff changeset	3409
154 0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression(). aziz parents: 153 diff changeset	3410 Expression parseNewExpression(/Expression e/)
81 aa1ea2548dd9 - Fixed parseExpression() method. aziz parents: 80 diff changeset	3411 {
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3412 auto begin = token;
144 cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon. aziz parents: 143 diff changeset	3413 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	3414 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	3415
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon. aziz parents: 143 diff changeset	3416 Expression[] newArguments;
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon. aziz parents: 143 diff changeset	3417 Expression[] ctorArguments;
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon. aziz parents: 143 diff changeset	3418
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon. aziz parents: 143 diff changeset	3419 if (token.type == T.LParen)
486 bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	3420 newArguments = parseArguments();
144 cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon. aziz parents: 143 diff changeset	3421
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon. aziz parents: 143 diff changeset	3422 // NewAnonClassExpression:
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon. aziz parents: 143 diff changeset	3423 // new (ArgumentList)opt class (ArgumentList)opt SuperClassopt InterfaceClassesopt ClassBody
531 315aeb3f7a9b Added method skipped() to dil.Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 530 diff changeset	3424 if (skipped(T.Class))
144 cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon. aziz parents: 143 diff changeset	3425 {
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon. aziz parents: 143 diff changeset	3426 if (token.type == T.LParen)
486 bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	3427 ctorArguments = parseArguments();
144 cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon. aziz parents: 143 diff changeset	3428
668 a1f8d8f2db38 Renamed some identifiers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 659 diff changeset	3429 BaseClassType[] bases = token.type != T.LBrace ? parseBaseClasses(false) : null ;
144 cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon. aziz parents: 143 diff changeset	3430
495 b60450804b6e Attributes are evaluated during the parsing phase now. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 494 diff changeset	3431 auto decls = parseDeclarationDefinitionsBody();
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3432 return set(new NewAnonClassExpression(/e, /newArguments, bases, ctorArguments, decls), begin);
144 cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon. aziz parents: 143 diff changeset	3433 }
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon. aziz parents: 143 diff changeset	3434
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon. aziz parents: 143 diff changeset	3435 // NewExpression:
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon. aziz parents: 143 diff changeset	3436 // NewArguments Type [ AssignExpression ]
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon. aziz parents: 143 diff changeset	3437 // NewArguments Type ( ArgumentList )
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon. aziz parents: 143 diff changeset	3438 // NewArguments Type
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon. aziz parents: 143 diff changeset	3439 auto type = parseType();
302 d04a79e795a2 - Fix in parseNewExpression(): removed check for type id. aziz parents: 301 diff changeset	3440
d04a79e795a2 - Fix in parseNewExpression(): removed check for type id. aziz parents: 301 diff changeset	3441 if (token.type == T.LParen)
486 bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	3442 ctorArguments = parseArguments();
302 d04a79e795a2 - Fix in parseNewExpression(): removed check for type id. aziz parents: 301 diff changeset	3443
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3444 return set(new NewExpression(/e, /newArguments, type, ctorArguments), begin);
81 aa1ea2548dd9 - Fixed parseExpression() method. aziz parents: 80 diff changeset	3445 }
aa1ea2548dd9 - Fixed parseExpression() method. aziz parents: 80 diff changeset	3446
98 aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3447 Type parseType()
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3448 {
104 b535016f8c3f - DeclaratorSuffix must be parsed after an Identifier. aziz parents: 103 diff changeset	3449 return parseBasicType2(parseBasicType());
98 aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3450 }
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3451
618 07946b379006 Refactored the way dot expressions are parsed. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 616 diff changeset	3452 Type parseIdentifierType()
07946b379006 Refactored the way dot expressions are parsed. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 616 diff changeset	3453 {
07946b379006 Refactored the way dot expressions are parsed. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 616 diff changeset	3454 auto begin = token;
07946b379006 Refactored the way dot expressions are parsed. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 616 diff changeset	3455 auto ident = requireIdentifier(MSG.ExpectedAnIdentifier);
07946b379006 Refactored the way dot expressions are parsed. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 616 diff changeset	3456 Type t;
07946b379006 Refactored the way dot expressions are parsed. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 616 diff changeset	3457 if (skipped(T.Not)) // Identifier !( TemplateArguments )
07946b379006 Refactored the way dot expressions are parsed. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 616 diff changeset	3458 t = new TemplateInstanceType(ident, parseTemplateArguments());
07946b379006 Refactored the way dot expressions are parsed. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 616 diff changeset	3459 else // Identifier
07946b379006 Refactored the way dot expressions are parsed. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 616 diff changeset	3460 t = new IdentifierType(ident);
07946b379006 Refactored the way dot expressions are parsed. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 616 diff changeset	3461 return set(t, begin);
07946b379006 Refactored the way dot expressions are parsed. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 616 diff changeset	3462 }
07946b379006 Refactored the way dot expressions are parsed. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 616 diff changeset	3463
07946b379006 Refactored the way dot expressions are parsed. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 616 diff changeset	3464 Type parseQualifiedType()
07946b379006 Refactored the way dot expressions are parsed. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 616 diff changeset	3465 {
07946b379006 Refactored the way dot expressions are parsed. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 616 diff changeset	3466 auto begin = token;
07946b379006 Refactored the way dot expressions are parsed. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 616 diff changeset	3467 Type type;
07946b379006 Refactored the way dot expressions are parsed. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 616 diff changeset	3468 if (skipped(T.Dot))
07946b379006 Refactored the way dot expressions are parsed. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 616 diff changeset	3469 type = set(new ModuleScopeType(parseIdentifierType()), begin);
07946b379006 Refactored the way dot expressions are parsed. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 616 diff changeset	3470 else if (token.type == T.Typeof)
07946b379006 Refactored the way dot expressions are parsed. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 616 diff changeset	3471 {
07946b379006 Refactored the way dot expressions are parsed. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 616 diff changeset	3472 type = parseTypeofType();
07946b379006 Refactored the way dot expressions are parsed. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 616 diff changeset	3473 if (token.type != T.Dot)
07946b379006 Refactored the way dot expressions are parsed. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 616 diff changeset	3474 return type;
07946b379006 Refactored the way dot expressions are parsed. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 616 diff changeset	3475 }
07946b379006 Refactored the way dot expressions are parsed. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 616 diff changeset	3476 else
07946b379006 Refactored the way dot expressions are parsed. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 616 diff changeset	3477 type = parseIdentifierType();
07946b379006 Refactored the way dot expressions are parsed. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 616 diff changeset	3478
07946b379006 Refactored the way dot expressions are parsed. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 616 diff changeset	3479 while (skipped(T.Dot))
07946b379006 Refactored the way dot expressions are parsed. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 616 diff changeset	3480 type = set(new QualifiedType(type, parseIdentifierType()), begin);
07946b379006 Refactored the way dot expressions are parsed. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 616 diff changeset	3481 return type;
07946b379006 Refactored the way dot expressions are parsed. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 616 diff changeset	3482 }
07946b379006 Refactored the way dot expressions are parsed. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 616 diff changeset	3483
94 0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	3484 Type parseBasicType()
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	3485 {
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3486 auto begin = token;
94 0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	3487 Type t;
508 943ecc9c133a Added isIntegralType() to Token and refactored code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 507 diff changeset	3488
943ecc9c133a Added isIntegralType() to Token and refactored code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 507 diff changeset	3489 if (token.isIntegralType)
943ecc9c133a Added isIntegralType() to Token and refactored code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 507 diff changeset	3490 {
943ecc9c133a Added isIntegralType() to Token and refactored code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 507 diff changeset	3491 t = new IntegralType(token.type);
943ecc9c133a Added isIntegralType() to Token and refactored code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 507 diff changeset	3492 nT();
943ecc9c133a Added isIntegralType() to Token and refactored code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 507 diff changeset	3493 }
943ecc9c133a Added isIntegralType() to Token and refactored code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 507 diff changeset	3494 else
94 0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	3495 switch (token.type)
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	3496 {
153 66790fc2c0a2 - Added method parseIdentifierListType(). aziz parents: 152 diff changeset	3497 case T.Identifier, T.Typeof, T.Dot:
618 07946b379006 Refactored the way dot expressions are parsed. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 616 diff changeset	3498 t = parseQualifiedType();
07946b379006 Refactored the way dot expressions are parsed. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 616 diff changeset	3499 return t;
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3500 version(D2)
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3501 {
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3502 case T.Const:
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3503 // const ( Type )
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3504 nT();
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3505 require(T.LParen);
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3506 t = parseType();
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3507 require(T.RParen);
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3508 t = new ConstType(t);
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3509 break;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3510 case T.Invariant:
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3511 // invariant ( Type )
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3512 nT();
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3513 require(T.LParen);
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3514 t = parseType();
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3515 require(T.RParen);
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3516 t = new InvariantType(t);
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3517 break;
369 27767e203d64 - Added override attribute to ImportParser.start(). aziz parents: 368 diff changeset	3518 } // version(D2)
94 0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	3519 default:
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	3520 error(MID.ExpectedButFound, "BasicType", token.srcText);
671 f1325a4506de Removed enum TID from dil.ast.Types. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 668 diff changeset	3521 t = new IllegalType();
259 8118da6fee44 - Moved nT() below statement where an attribute class is constructed. aziz parents: 258 diff changeset	3522 nT();
94 0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	3523 }
508 943ecc9c133a Added isIntegralType() to Token and refactored code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 507 diff changeset	3524 return set(t, begin);
94 0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	3525 }
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information. aziz parents: 93 diff changeset	3526
95 0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	3527 Type parseBasicType2(Type t)
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	3528 {
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3529 typeof(token) begin;
95 0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	3530 while (1)
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	3531 {
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3532 begin = token;
95 0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	3533 switch (token.type)
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	3534 {
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	3535 case T.Mul:
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	3536 t = new PointerType(t);
98 aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3537 nT();
95 0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	3538 break;
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	3539 case T.LBracket:
106 441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	3540 t = parseArrayType(t);
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3541 continue;
98 aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3542 case T.Function, T.Delegate:
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3543 TOK tok = token.type;
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3544 nT();
143 e760d7552f66 - Renamed parseArgumentList() to parseArguments(). aziz parents: 141 diff changeset	3545 auto parameters = parseParameterList();
135 145e0d68ec95 - Added enum TID to module Type. aziz parents: 134 diff changeset	3546 if (tok == T.Function)
291 c0e857931ff6 - Changed FunctionType and DelegateType. Both receive return type and parameters. aziz parents: 290 diff changeset	3547 t = new FunctionType(t, parameters);
135 145e0d68ec95 - Added enum TID to module Type. aziz parents: 134 diff changeset	3548 else
291 c0e857931ff6 - Changed FunctionType and DelegateType. Both receive return type and parameters. aziz parents: 290 diff changeset	3549 t = new DelegateType(t, parameters);
98 aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3550 break;
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3551 default:
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3552 return t;
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3553 }
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3554 set(t, begin);
98 aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3555 }
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3556 assert(0);
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3557 }
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3558
232 2a4e2c8ca094 - Renamed method isTemplateParameterList() to tokenAfterParenIs(). aziz parents: 231 diff changeset	3559 bool tokenAfterParenIs(TOK tok)
196 ea3f66901fa4 - Added code for parsing template parameter lists for functions. aziz parents: 195 diff changeset	3560 {
ea3f66901fa4 - Added code for parsing template parameter lists for functions. aziz parents: 195 diff changeset	3561 // We count nested parentheses tokens because template types may appear inside parameter lists; e.g. (int x, Foo!(int) y).
232 2a4e2c8ca094 - Renamed method isTemplateParameterList() to tokenAfterParenIs(). aziz parents: 231 diff changeset	3562 assert(token.type == T.LParen);
239 7911f6a92e6e - Added 'new' and 'delete' declarations to Token and uncommented next and prev members. Added HEAD to TOK. aziz parents: 238 diff changeset	3563 Token* next = token;
196 ea3f66901fa4 - Added code for parsing template parameter lists for functions. aziz parents: 195 diff changeset	3564 uint level = 1;
434 cac9c8d637ad Fix: members related to error info weren't updated correctly. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 429 diff changeset	3565 Loop:
196 ea3f66901fa4 - Added code for parsing template parameter lists for functions. aziz parents: 195 diff changeset	3566 while (1)
ea3f66901fa4 - Added code for parsing template parameter lists for functions. aziz parents: 195 diff changeset	3567 {
619 933cd8d24467 Renamed Parser.lx to Parser.lexer. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 618 diff changeset	3568 lexer.peek(next);
232 2a4e2c8ca094 - Renamed method isTemplateParameterList() to tokenAfterParenIs(). aziz parents: 231 diff changeset	3569 switch (next.type)
196 ea3f66901fa4 - Added code for parsing template parameter lists for functions. aziz parents: 195 diff changeset	3570 {
ea3f66901fa4 - Added code for parsing template parameter lists for functions. aziz parents: 195 diff changeset	3571 case T.RParen:
ea3f66901fa4 - Added code for parsing template parameter lists for functions. aziz parents: 195 diff changeset	3572 if (--level == 0)
434 cac9c8d637ad Fix: members related to error info weren't updated correctly. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 429 diff changeset	3573 { // Last, closing parentheses found.
cac9c8d637ad Fix: members related to error info weren't updated correctly. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 429 diff changeset	3574 do
619 933cd8d24467 Renamed Parser.lx to Parser.lexer. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 618 diff changeset	3575 lexer.peek(next);
434 cac9c8d637ad Fix: members related to error info weren't updated correctly. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 429 diff changeset	3576 while (next.isWhitespace)
cac9c8d637ad Fix: members related to error info weren't updated correctly. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 429 diff changeset	3577 break Loop;
196 ea3f66901fa4 - Added code for parsing template parameter lists for functions. aziz parents: 195 diff changeset	3578 }
434 cac9c8d637ad Fix: members related to error info weren't updated correctly. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 429 diff changeset	3579 break;
196 ea3f66901fa4 - Added code for parsing template parameter lists for functions. aziz parents: 195 diff changeset	3580 case T.LParen:
ea3f66901fa4 - Added code for parsing template parameter lists for functions. aziz parents: 195 diff changeset	3581 ++level;
434 cac9c8d637ad Fix: members related to error info weren't updated correctly. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 429 diff changeset	3582 break;
196 ea3f66901fa4 - Added code for parsing template parameter lists for functions. aziz parents: 195 diff changeset	3583 case T.EOF:
434 cac9c8d637ad Fix: members related to error info weren't updated correctly. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 429 diff changeset	3584 break Loop;
196 ea3f66901fa4 - Added code for parsing template parameter lists for functions. aziz parents: 195 diff changeset	3585 default:
ea3f66901fa4 - Added code for parsing template parameter lists for functions. aziz parents: 195 diff changeset	3586 }
ea3f66901fa4 - Added code for parsing template parameter lists for functions. aziz parents: 195 diff changeset	3587 }
232 2a4e2c8ca094 - Renamed method isTemplateParameterList() to tokenAfterParenIs(). aziz parents: 231 diff changeset	3588 return next.type == tok;
196 ea3f66901fa4 - Added code for parsing template parameter lists for functions. aziz parents: 195 diff changeset	3589 }
ea3f66901fa4 - Added code for parsing template parameter lists for functions. aziz parents: 195 diff changeset	3590
98 aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3591 Type parseDeclaratorSuffix(Type t)
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3592 {
192 5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	3593 switch (token.type)
98 aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3594 {
192 5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	3595 case T.LBracket:
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	3596 // Type Identifier ArrayType
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	3597 // ArrayType := [] or [Type] or [Expression..Expression]
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	3598 do
106 441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	3599 t = parseArrayType(t);
192 5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	3600 while (token.type == T.LBracket)
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	3601 break;
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	3602 /+ // parsed in parseDeclaration()
192 5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	3603 case T.LParen:
258 112a57f433f2 - Created class TemplateParameters. aziz parents: 257 diff changeset	3604 TemplateParameters tparams;
232 2a4e2c8ca094 - Renamed method isTemplateParameterList() to tokenAfterParenIs(). aziz parents: 231 diff changeset	3605 if (tokenAfterParenIs(T.LParen))
196 ea3f66901fa4 - Added code for parsing template parameter lists for functions. aziz parents: 195 diff changeset	3606 {
ea3f66901fa4 - Added code for parsing template parameter lists for functions. aziz parents: 195 diff changeset	3607 // ( TemplateParameterList ) ( ParameterList )
ea3f66901fa4 - Added code for parsing template parameter lists for functions. aziz parents: 195 diff changeset	3608 tparams = parseTemplateParameterList();
ea3f66901fa4 - Added code for parsing template parameter lists for functions. aziz parents: 195 diff changeset	3609 }
ea3f66901fa4 - Added code for parsing template parameter lists for functions. aziz parents: 195 diff changeset	3610
192 5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	3611 auto params = parseParameterList();
5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	3612 // ReturnType FunctionName ( ParameterList )
196 ea3f66901fa4 - Added code for parsing template parameter lists for functions. aziz parents: 195 diff changeset	3613 t = new FunctionType(t, params, tparams);
192 5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	3614 break;
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	3615 +/
192 5c898f80b436 - Started implementation of parseDeclaration(). aziz parents: 191 diff changeset	3616 default:
98 aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3617 break;
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3618 }
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3619 return t;
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3620 }
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3621
106 441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	3622 Type parseArrayType(Type t)
441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	3623 {
441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	3624 assert(token.type == T.LBracket);
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3625 auto begin = token;
106 441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	3626 nT();
531 315aeb3f7a9b Added method skipped() to dil.Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 530 diff changeset	3627 if (skipped(T.RBracket))
106 441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	3628 t = new ArrayType(t);
441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	3629 else
441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	3630 {
214 45fc474c1678 - Changed 'failed' parameter of try_() to 'success'. aziz parents: 213 diff changeset	3631 bool success;
369 27767e203d64 - Added override attribute to ImportParser.start(). aziz parents: 368 diff changeset	3632 Type parseAAType()
27767e203d64 - Added override attribute to ImportParser.start(). aziz parents: 368 diff changeset	3633 {
27767e203d64 - Added override attribute to ImportParser.start(). aziz parents: 368 diff changeset	3634 auto type = parseType();
27767e203d64 - Added override attribute to ImportParser.start(). aziz parents: 368 diff changeset	3635 require(T.RBracket);
27767e203d64 - Added override attribute to ImportParser.start(). aziz parents: 368 diff changeset	3636 return type;
27767e203d64 - Added override attribute to ImportParser.start(). aziz parents: 368 diff changeset	3637 }
423 6057113f9a44 Refactored Parser.try_(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 422 diff changeset	3638 auto assocType = try_(&parseAAType, success);
214 45fc474c1678 - Changed 'failed' parameter of try_() to 'success'. aziz parents: 213 diff changeset	3639 if (success)
106 441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	3640 t = new ArrayType(t, assocType);
441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	3641 else
441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	3642 {
441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	3643 Expression e = parseExpression(), e2;
531 315aeb3f7a9b Added method skipped() to dil.Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 530 diff changeset	3644 if (skipped(T.Slice))
106 441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	3645 e2 = parseExpression();
441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	3646 t = new ArrayType(t, e, e2);
369 27767e203d64 - Added override attribute to ImportParser.start(). aziz parents: 368 diff changeset	3647 require(T.RBracket);
106 441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	3648 }
441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	3649 }
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3650 set(t, begin);
106 441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	3651 return t;
441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	3652 }
441962b0f526 - Added parseArrayType() method. aziz parents: 105 diff changeset	3653
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	3654 Type parseCFunctionPointerType(Type type, ref Identifier* ident, bool optionalParamList)
409 38fccd2640eb Added code for parsing C function pointer declarations. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 406 diff changeset	3655 {
38fccd2640eb Added code for parsing C function pointer declarations. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 406 diff changeset	3656 assert(token.type == T.LParen);
483 180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	3657 assert(type !is null);
409 38fccd2640eb Added code for parsing C function pointer declarations. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 406 diff changeset	3658 auto begin = token;
38fccd2640eb Added code for parsing C function pointer declarations. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 406 diff changeset	3659 nT(); // Skip (
38fccd2640eb Added code for parsing C function pointer declarations. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 406 diff changeset	3660 type = parseBasicType2(type);
38fccd2640eb Added code for parsing C function pointer declarations. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 406 diff changeset	3661 if (token.type == T.LParen)
38fccd2640eb Added code for parsing C function pointer declarations. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 406 diff changeset	3662 {
38fccd2640eb Added code for parsing C function pointer declarations. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 406 diff changeset	3663 // Can be nested.
483 180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	3664 type = parseCFunctionPointerType(type, ident, true);
409 38fccd2640eb Added code for parsing C function pointer declarations. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 406 diff changeset	3665 }
38fccd2640eb Added code for parsing C function pointer declarations. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 406 diff changeset	3666 else if (token.type == T.Identifier)
38fccd2640eb Added code for parsing C function pointer declarations. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 406 diff changeset	3667 {
38fccd2640eb Added code for parsing C function pointer declarations. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 406 diff changeset	3668 // The identifier of the function pointer and the declaration.
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	3669 ident = token.ident;
409 38fccd2640eb Added code for parsing C function pointer declarations. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 406 diff changeset	3670 nT();
38fccd2640eb Added code for parsing C function pointer declarations. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 406 diff changeset	3671 type = parseDeclaratorSuffix(type);
38fccd2640eb Added code for parsing C function pointer declarations. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 406 diff changeset	3672 }
38fccd2640eb Added code for parsing C function pointer declarations. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 406 diff changeset	3673 require(T.RParen);
483 180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	3674
180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	3675 Parameters params;
180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	3676 if (optionalParamList)
180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	3677 params = token.type == T.LParen ? parseParameterList() : null;
180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	3678 else
180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	3679 params = parseParameterList();
180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	3680
535 bdd49ad84f5f Fixed parsing bug in parseVariableOrFunction(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 532 diff changeset	3681 type = new CFuncPointerType(type, params);
bdd49ad84f5f Fixed parsing bug in parseVariableOrFunction(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 532 diff changeset	3682 return set(type, begin);
409 38fccd2640eb Added code for parsing C function pointer declarations. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 406 diff changeset	3683 }
38fccd2640eb Added code for parsing C function pointer declarations. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 406 diff changeset	3684
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	3685 Type parseDeclarator(ref Identifier* ident, bool identOptional = false)
98 aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3686 {
104 b535016f8c3f - DeclaratorSuffix must be parsed after an Identifier. aziz parents: 103 diff changeset	3687 auto t = parseType();
98 aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3688
409 38fccd2640eb Added code for parsing C function pointer declarations. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 406 diff changeset	3689 if (token.type == T.LParen)
483 180711cc4b66 Fixed parsing of C-style function pointers. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 434 diff changeset	3690 t = parseCFunctionPointerType(t, ident, true);
409 38fccd2640eb Added code for parsing C function pointer declarations. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 406 diff changeset	3691 else if (token.type == T.Identifier)
98 aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3692 {
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	3693 ident = token.ident;
95 0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	3694 nT();
104 b535016f8c3f - DeclaratorSuffix must be parsed after an Identifier. aziz parents: 103 diff changeset	3695 t = parseDeclaratorSuffix(t);
95 0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	3696 }
409 38fccd2640eb Added code for parsing C function pointer declarations. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 406 diff changeset	3697
38fccd2640eb Added code for parsing C function pointer declarations. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 406 diff changeset	3698 if (ident is null && !identOptional)
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	3699 error(token, MSG.ExpectedDeclaratorIdentifier, token.srcText);
98 aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement. aziz parents: 97 diff changeset	3700
104 b535016f8c3f - DeclaratorSuffix must be parsed after an Identifier. aziz parents: 103 diff changeset	3701 return t;
95 0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	3702 }
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	3703
486 bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	3704 /++
bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	3705 Parse a list of AssignExpressions.
bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	3706 ExpressionList:
bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	3707 AssignExpression
bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	3708 AssignExpression , ExpressionList
bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	3709 +/
bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	3710 Expression[] parseExpressionList()
138 91b5187ed775 - Moved parseArgumentList() down a bit. aziz parents: 137 diff changeset	3711 {
486 bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	3712 Expression[] expressions;
531 315aeb3f7a9b Added method skipped() to dil.Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 530 diff changeset	3713 do
486 bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	3714 expressions ~= parseAssignExpression();
531 315aeb3f7a9b Added method skipped() to dil.Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 530 diff changeset	3715 while(skipped(T.Comma))
486 bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	3716 return expressions;
bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	3717 }
bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	3718
bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	3719 /++
bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	3720 Arguments:
bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	3721 ( )
bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	3722 ( ExpressionList )
bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	3723 +/
bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	3724 Expression[] parseArguments()
bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	3725 {
bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	3726 assert(token.type == T.LParen);
bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	3727 nT();
bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	3728 Expression[] args;
bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	3729 if (token.type != TOK.RParen)
bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	3730 args = parseExpressionList();
bd176bc73e43 Fixed a few things in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 485 diff changeset	3731 require(TOK.RParen);
139 d48f345b05f8 - Implemented parseTemplateArgumentList(). aziz parents: 138 diff changeset	3732 return args;
138 91b5187ed775 - Moved parseArgumentList() down a bit. aziz parents: 137 diff changeset	3733 }
91b5187ed775 - Moved parseArgumentList() down a bit. aziz parents: 137 diff changeset	3734
143 e760d7552f66 - Renamed parseArgumentList() to parseArguments(). aziz parents: 141 diff changeset	3735 Parameters parseParameterList()
117 79857de26e86 - Moved class Parameter to module Types. Added struct Parameters. aziz parents: 116 diff changeset	3736 out(params)
96 d12d31d5fc17 - Added out-contract to parseParameters(). aziz parents: 95 diff changeset	3737 {
117 79857de26e86 - Moved class Parameter to module Types. Added struct Parameters. aziz parents: 116 diff changeset	3738 if (params.length > 1)
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters. aziz parents: 116 diff changeset	3739 foreach (param; params.items[0..$-1])
96 d12d31d5fc17 - Added out-contract to parseParameters(). aziz parents: 95 diff changeset	3740 {
117 79857de26e86 - Moved class Parameter to module Types. Added struct Parameters. aziz parents: 116 diff changeset	3741 if (param.isVariadic())
96 d12d31d5fc17 - Added out-contract to parseParameters(). aziz parents: 95 diff changeset	3742 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	3743 }
d12d31d5fc17 - Added out-contract to parseParameters(). aziz parents: 95 diff changeset	3744 }
d12d31d5fc17 - Added out-contract to parseParameters(). aziz parents: 95 diff changeset	3745 body
95 0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	3746 {
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3747 auto begin = token;
95 0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	3748 require(T.LParen);
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	3749
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3750 auto params = new Parameters();
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3751
531 315aeb3f7a9b Added method skipped() to dil.Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 530 diff changeset	3752 if (skipped(T.RParen))
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3753 return set(params, begin);
95 0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	3754
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	3755 Loop:
95 0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	3756 while (1)
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	3757 {
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3758 auto paramBegin = token;
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3759 StorageClass stc, tmp;
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	3760 Type type;
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	3761 Identifier* ident;
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	3762 Expression defValue;
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	3763
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	3764 void pushParameter()
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	3765 {
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	3766 params ~= set(new Parameter(stc, type, ident, defValue), paramBegin);
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	3767 }
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3768
531 315aeb3f7a9b Added method skipped() to dil.Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 530 diff changeset	3769 if (skipped(T.Ellipses))
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3770 {
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	3771 stc = StorageClass.Variadic;
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	3772 pushParameter(); // type, ident and defValue will be null.
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	3773 break Loop;
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3774 }
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3775
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3776 Lstc_loop:
95 0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	3777 switch (token.type)
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	3778 {
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	3779 version(D2)
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	3780 {
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3781 case T.Invariant: // D2.0
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3782 if (peekNext() == T.LParen)
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3783 goto default;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3784 tmp = StorageClass.Invariant;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3785 goto Lcommon;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3786 case T.Const: // D2.0
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3787 if (peekNext() == T.LParen)
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3788 goto default;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3789 tmp = StorageClass.Const;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3790 goto Lcommon;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3791 case T.Final: // D2.0
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3792 tmp = StorageClass.Final;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3793 goto Lcommon;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3794 case T.Scope: // D2.0
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3795 tmp = StorageClass.Scope;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3796 goto Lcommon;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3797 case T.Static: // D2.0
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3798 tmp = StorageClass.Static;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3799 goto Lcommon;
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	3800 }
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3801 case T.In:
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3802 tmp = StorageClass.In;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3803 goto Lcommon;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3804 case T.Out:
282 74113a9aa77c - Fix: assigned wrong StorageClass to variable. aziz parents: 280 diff changeset	3805 tmp = StorageClass.Out;
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3806 goto Lcommon;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3807 case T.Inout, T.Ref:
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3808 tmp = StorageClass.Ref;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3809 goto Lcommon;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3810 case T.Lazy:
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3811 tmp = StorageClass.Lazy;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3812 goto Lcommon;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3813 Lcommon:
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	3814 // Check for redundancy.
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3815 if (stc & tmp)
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3816 error(MID.RedundantStorageClass, token.srcText);
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3817 else
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3818 stc \|= tmp;
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3819 nT();
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	3820 version(D2)
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3821 goto Lstc_loop;
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	3822 else
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	3823 goto default; // In D1.0 only one stc per parameter is allowed.
95 0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	3824 default:
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	3825 type = parseDeclarator(ident, true);
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	3826
531 315aeb3f7a9b Added method skipped() to dil.Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 530 diff changeset	3827 if (skipped(T.Assign))
315aeb3f7a9b Added method skipped() to dil.Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 530 diff changeset	3828 defValue = parseAssignExpression();
315aeb3f7a9b Added method skipped() to dil.Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 530 diff changeset	3829
315aeb3f7a9b Added method skipped() to dil.Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 530 diff changeset	3830 if (skipped(T.Ellipses))
95 0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	3831 {
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	3832 stc \|= StorageClass.Variadic;
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	3833 pushParameter();
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	3834 break Loop;
95 0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	3835 }
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	3836
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	3837 pushParameter();
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3838
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3839 if (token.type != T.Comma)
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	3840 break Loop;
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3841 nT();
95 0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	3842 }
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	3843 }
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	3844 require(T.RParen);
242 7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token. aziz* parents: 240 diff changeset	3845 return set(params, begin);
95 0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	3846 }
0eb4c8a5b32b - Added TOK.Invalid. aziz parents: 94 diff changeset	3847
150 753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument. aziz parents: 149 diff changeset	3848 TemplateArguments parseTemplateArguments()
139 d48f345b05f8 - Implemented parseTemplateArgumentList(). aziz parents: 138 diff changeset	3849 {
376 5ebe80ce84f2 - Separated common code to parseTemplateArguments_(). aziz parents: 375 diff changeset	3850 TemplateArguments targs;
139 d48f345b05f8 - Implemented parseTemplateArgumentList(). aziz parents: 138 diff changeset	3851 require(T.LParen);
255 7ba0229af908 - Fixed parseTemplateArguments. Removed a return path and put the while loop into an if-statement. aziz parents: 254 diff changeset	3852 if (token.type != T.RParen)
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	3853 targs = parseTemplateArguments_();
139 d48f345b05f8 - Implemented parseTemplateArgumentList(). aziz parents: 138 diff changeset	3854 require(T.RParen);
376 5ebe80ce84f2 - Separated common code to parseTemplateArguments_(). aziz parents: 375 diff changeset	3855 return targs;
139 d48f345b05f8 - Implemented parseTemplateArgumentList(). aziz parents: 138 diff changeset	3856 }
376 5ebe80ce84f2 - Separated common code to parseTemplateArguments_(). aziz parents: 375 diff changeset	3857
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3858 version(D2)
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3859 {
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3860 TemplateArguments parseTemplateArguments2()
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3861 {
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3862 assert(token.type == T.Comma);
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3863 nT();
376 5ebe80ce84f2 - Separated common code to parseTemplateArguments_(). aziz parents: 375 diff changeset	3864 TemplateArguments targs;
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3865 if (token.type != T.RParen)
376 5ebe80ce84f2 - Separated common code to parseTemplateArguments_(). aziz parents: 375 diff changeset	3866 targs = parseTemplateArguments_();
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3867 else
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	3868 error(token, MSG.ExpectedTypeOrExpression);
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3869 require(T.RParen);
376 5ebe80ce84f2 - Separated common code to parseTemplateArguments_(). aziz parents: 375 diff changeset	3870 return targs;
269 a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3871 }
a416e09c08ea - Implemented D 2.0 additions. aziz parents: 268 diff changeset	3872 } // version(D2)
376 5ebe80ce84f2 - Separated common code to parseTemplateArguments_(). aziz parents: 375 diff changeset	3873
5ebe80ce84f2 - Separated common code to parseTemplateArguments_(). aziz parents: 375 diff changeset	3874 TemplateArguments parseTemplateArguments_()
5ebe80ce84f2 - Separated common code to parseTemplateArguments_(). aziz parents: 375 diff changeset	3875 {
5ebe80ce84f2 - Separated common code to parseTemplateArguments_(). aziz parents: 375 diff changeset	3876 auto begin = token;
5ebe80ce84f2 - Separated common code to parseTemplateArguments_(). aziz parents: 375 diff changeset	3877 auto targs = new TemplateArguments;
5ebe80ce84f2 - Separated common code to parseTemplateArguments_(). aziz parents: 375 diff changeset	3878 while (1)
5ebe80ce84f2 - Separated common code to parseTemplateArguments_(). aziz parents: 375 diff changeset	3879 {
379 a92f7826a4fa - Fix in parseTemplateArguments_(): calling nested parseType_() instead of parseType() in try_(). aziz parents: 377 diff changeset	3880 Type parseType_()
a92f7826a4fa - Fix in parseTemplateArguments_(): calling nested parseType_() instead of parseType() in try_(). aziz parents: 377 diff changeset	3881 {
a92f7826a4fa - Fix in parseTemplateArguments_(): calling nested parseType_() instead of parseType() in try_(). aziz parents: 377 diff changeset	3882 auto type = parseType();
a92f7826a4fa - Fix in parseTemplateArguments_(): calling nested parseType_() instead of parseType() in try_(). aziz parents: 377 diff changeset	3883 if (token.type == T.Comma \|\| token.type == T.RParen)
a92f7826a4fa - Fix in parseTemplateArguments_(): calling nested parseType_() instead of parseType() in try_(). aziz parents: 377 diff changeset	3884 return type;
a92f7826a4fa - Fix in parseTemplateArguments_(): calling nested parseType_() instead of parseType() in try_(). aziz parents: 377 diff changeset	3885 ++errorCount; // Cause try_() to fail.
a92f7826a4fa - Fix in parseTemplateArguments_(): calling nested parseType_() instead of parseType() in try_(). aziz parents: 377 diff changeset	3886 return null;
a92f7826a4fa - Fix in parseTemplateArguments_(): calling nested parseType_() instead of parseType() in try_(). aziz parents: 377 diff changeset	3887 }
376 5ebe80ce84f2 - Separated common code to parseTemplateArguments_(). aziz parents: 375 diff changeset	3888 bool success;
423 6057113f9a44 Refactored Parser.try_(). Aziz K?ksal <aziz.koeksal@gmail.com> parents: 422 diff changeset	3889 auto typeArgument = try_(&parseType_, success);
376 5ebe80ce84f2 - Separated common code to parseTemplateArguments_(). aziz parents: 375 diff changeset	3890 if (success)
5ebe80ce84f2 - Separated common code to parseTemplateArguments_(). aziz parents: 375 diff changeset	3891 // TemplateArgument:
5ebe80ce84f2 - Separated common code to parseTemplateArguments_(). aziz parents: 375 diff changeset	3892 // Type
5ebe80ce84f2 - Separated common code to parseTemplateArguments_(). aziz parents: 375 diff changeset	3893 // Symbol
5ebe80ce84f2 - Separated common code to parseTemplateArguments_(). aziz parents: 375 diff changeset	3894 targs ~= typeArgument;
5ebe80ce84f2 - Separated common code to parseTemplateArguments_(). aziz parents: 375 diff changeset	3895 else
5ebe80ce84f2 - Separated common code to parseTemplateArguments_(). aziz parents: 375 diff changeset	3896 // TemplateArgument:
5ebe80ce84f2 - Separated common code to parseTemplateArguments_(). aziz parents: 375 diff changeset	3897 // AssignExpression
5ebe80ce84f2 - Separated common code to parseTemplateArguments_(). aziz parents: 375 diff changeset	3898 targs ~= parseAssignExpression();
5ebe80ce84f2 - Separated common code to parseTemplateArguments_(). aziz parents: 375 diff changeset	3899 if (token.type != T.Comma)
5ebe80ce84f2 - Separated common code to parseTemplateArguments_(). aziz parents: 375 diff changeset	3900 break; // Exit loop.
5ebe80ce84f2 - Separated common code to parseTemplateArguments_(). aziz parents: 375 diff changeset	3901 nT();
5ebe80ce84f2 - Separated common code to parseTemplateArguments_(). aziz parents: 375 diff changeset	3902 }
5ebe80ce84f2 - Separated common code to parseTemplateArguments_(). aziz parents: 375 diff changeset	3903 set(targs, begin);
5ebe80ce84f2 - Separated common code to parseTemplateArguments_(). aziz parents: 375 diff changeset	3904 return targs;
5ebe80ce84f2 - Separated common code to parseTemplateArguments_(). aziz parents: 375 diff changeset	3905 }
5ebe80ce84f2 - Separated common code to parseTemplateArguments_(). aziz parents: 375 diff changeset	3906
258 112a57f433f2 - Created class TemplateParameters. aziz parents: 257 diff changeset	3907 TemplateParameters parseTemplateParameterList()
137 b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	3908 {
377 906599374b69 - Added tparams member to IsExpression. aziz parents: 376 diff changeset	3909 TemplateParameters tparams;
906599374b69 - Added tparams member to IsExpression. aziz parents: 376 diff changeset	3910 require(T.LParen);
906599374b69 - Added tparams member to IsExpression. aziz parents: 376 diff changeset	3911 if (token.type != T.RParen)
906599374b69 - Added tparams member to IsExpression. aziz parents: 376 diff changeset	3912 tparams = parseTemplateParameterList_();
906599374b69 - Added tparams member to IsExpression. aziz parents: 376 diff changeset	3913 require(T.RParen);
906599374b69 - Added tparams member to IsExpression. aziz parents: 376 diff changeset	3914 return tparams;
906599374b69 - Added tparams member to IsExpression. aziz parents: 376 diff changeset	3915 }
906599374b69 - Added tparams member to IsExpression. aziz parents: 376 diff changeset	3916
906599374b69 - Added tparams member to IsExpression. aziz parents: 376 diff changeset	3917 version(D2)
906599374b69 - Added tparams member to IsExpression. aziz parents: 376 diff changeset	3918 {
906599374b69 - Added tparams member to IsExpression. aziz parents: 376 diff changeset	3919 TemplateParameters parseTemplateParameterList2()
906599374b69 - Added tparams member to IsExpression. aziz parents: 376 diff changeset	3920 {
906599374b69 - Added tparams member to IsExpression. aziz parents: 376 diff changeset	3921 assert(token.type == T.Comma);
906599374b69 - Added tparams member to IsExpression. aziz parents: 376 diff changeset	3922 nT();
906599374b69 - Added tparams member to IsExpression. aziz parents: 376 diff changeset	3923 TemplateParameters tparams;
906599374b69 - Added tparams member to IsExpression. aziz parents: 376 diff changeset	3924 if (token.type != T.RParen)
906599374b69 - Added tparams member to IsExpression. aziz parents: 376 diff changeset	3925 tparams = parseTemplateParameterList_();
906599374b69 - Added tparams member to IsExpression. aziz parents: 376 diff changeset	3926 else
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	3927 error(token, MSG.ExpectedTemplateParameters);
377 906599374b69 - Added tparams member to IsExpression. aziz parents: 376 diff changeset	3928 return tparams;
906599374b69 - Added tparams member to IsExpression. aziz parents: 376 diff changeset	3929 }
906599374b69 - Added tparams member to IsExpression. aziz parents: 376 diff changeset	3930 } // version(D2)
906599374b69 - Added tparams member to IsExpression. aziz parents: 376 diff changeset	3931
906599374b69 - Added tparams member to IsExpression. aziz parents: 376 diff changeset	3932 TemplateParameters parseTemplateParameterList_()
906599374b69 - Added tparams member to IsExpression. aziz parents: 376 diff changeset	3933 {
258 112a57f433f2 - Created class TemplateParameters. aziz parents: 257 diff changeset	3934 auto begin = token;
295 75b47c71a34c - Assigning to Node.children in several constructors that inherit from Node. aziz parents: 293 diff changeset	3935 auto tparams = new TemplateParameters;
75b47c71a34c - Assigning to Node.children in several constructors that inherit from Node. aziz parents: 293 diff changeset	3936
137 b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	3937 while (1)
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	3938 {
258 112a57f433f2 - Created class TemplateParameters. aziz parents: 257 diff changeset	3939 auto paramBegin = token;
340 1accb3013bd2 - Changed class TemplateParameter to an abstract class. aziz parents: 335 diff changeset	3940 TemplateParameter tp;
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	3941 Identifier* ident;
137 b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	3942 Type specType, defType;
340 1accb3013bd2 - Changed class TemplateParameter to an abstract class. aziz parents: 335 diff changeset	3943
1accb3013bd2 - Changed class TemplateParameter to an abstract class. aziz parents: 335 diff changeset	3944 void parseSpecAndOrDefaultType()
137 b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	3945 {
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	3946 // : SpecializationType
531 315aeb3f7a9b Added method skipped() to dil.Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 530 diff changeset	3947 if (skipped(T.Colon))
137 b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	3948 specType = parseType();
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	3949 // = DefaultType
531 315aeb3f7a9b Added method skipped() to dil.Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 530 diff changeset	3950 if (skipped(T.Assign))
137 b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	3951 defType = parseType();
340 1accb3013bd2 - Changed class TemplateParameter to an abstract class. aziz parents: 335 diff changeset	3952 }
1accb3013bd2 - Changed class TemplateParameter to an abstract class. aziz parents: 335 diff changeset	3953
1accb3013bd2 - Changed class TemplateParameter to an abstract class. aziz parents: 335 diff changeset	3954 switch (token.type)
1accb3013bd2 - Changed class TemplateParameter to an abstract class. aziz parents: 335 diff changeset	3955 {
1accb3013bd2 - Changed class TemplateParameter to an abstract class. aziz parents: 335 diff changeset	3956 case T.Alias:
1accb3013bd2 - Changed class TemplateParameter to an abstract class. aziz parents: 335 diff changeset	3957 // TemplateAliasParameter:
1accb3013bd2 - Changed class TemplateParameter to an abstract class. aziz parents: 335 diff changeset	3958 // alias Identifier
1accb3013bd2 - Changed class TemplateParameter to an abstract class. aziz parents: 335 diff changeset	3959 nT(); // Skip alias keyword.
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	3960 ident = requireIdentifier(MSG.ExpectedAliasTemplateParam);
340 1accb3013bd2 - Changed class TemplateParameter to an abstract class. aziz parents: 335 diff changeset	3961 parseSpecAndOrDefaultType();
1accb3013bd2 - Changed class TemplateParameter to an abstract class. aziz parents: 335 diff changeset	3962 tp = new TemplateAliasParameter(ident, specType, defType);
137 b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	3963 break;
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	3964 case T.Identifier:
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	3965 ident = token.ident;
238 f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext(). aziz parents: 237 diff changeset	3966 switch (peekNext())
137 b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	3967 {
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	3968 case T.Ellipses:
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	3969 // TemplateTupleParameter:
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	3970 // Identifier ...
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	3971 nT(); // Skip Identifier.
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	3972 nT(); // Skip Ellipses.
341 3ac651ea83fb - Fix: created TemplateAliasParameter instead of TemplateTypeParameter. aziz parents: 340 diff changeset	3973 if (token.type == T.Comma)
342 f13d551d7c4f - Added error messages MID.InContract and MID.OutContract. aziz parents: 341 diff changeset	3974 error(MID.TemplateTupleParameter);
340 1accb3013bd2 - Changed class TemplateParameter to an abstract class. aziz parents: 335 diff changeset	3975 tp = new TemplateTupleParameter(ident);
137 b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	3976 break;
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	3977 case T.Comma, T.RParen, T.Colon, T.Assign:
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	3978 // TemplateTypeParameter:
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	3979 // Identifier
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	3980 nT(); // Skip Identifier.
340 1accb3013bd2 - Changed class TemplateParameter to an abstract class. aziz parents: 335 diff changeset	3981 parseSpecAndOrDefaultType();
341 3ac651ea83fb - Fix: created TemplateAliasParameter instead of TemplateTypeParameter. aziz parents: 340 diff changeset	3982 tp = new TemplateTypeParameter(ident, specType, defType);
137 b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	3983 break;
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	3984 default:
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	3985 // TemplateValueParameter:
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	3986 // Declarator
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	3987 ident = null;
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	3988 goto LTemplateValueParameter;
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	3989 }
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	3990 break;
492 9c208925a3d4 Added module ImportParser and new stuff from DMD2.008. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 491 diff changeset	3991 version(D2)
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 491 diff changeset	3992 {
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 491 diff changeset	3993 case T.This:
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 491 diff changeset	3994 // TemplateThisParameter
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 491 diff changeset	3995 // this TemplateTypeParameter
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 491 diff changeset	3996 nT(); // Skip 'this' keyword.
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	3997 ident = requireIdentifier(MSG.ExpectedNameForThisTempParam);
492 9c208925a3d4 Added module ImportParser and new stuff from DMD2.008. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 491 diff changeset	3998 parseSpecAndOrDefaultType();
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 491 diff changeset	3999 tp = new TemplateThisParameter(ident, specType, defType);
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 491 diff changeset	4000 break;
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 491 diff changeset	4001 }
137 b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4002 default:
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4003 LTemplateValueParameter:
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4004 // TemplateValueParameter:
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4005 // Declarator
340 1accb3013bd2 - Changed class TemplateParameter to an abstract class. aziz parents: 335 diff changeset	4006 Expression specValue, defValue;
1accb3013bd2 - Changed class TemplateParameter to an abstract class. aziz parents: 335 diff changeset	4007 auto valueType = parseDeclarator(ident);
137 b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4008 // : SpecializationValue
531 315aeb3f7a9b Added method skipped() to dil.Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 530 diff changeset	4009 if (skipped(T.Colon))
137 b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4010 specValue = parseCondExpression();
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4011 // = DefaultValue
531 315aeb3f7a9b Added method skipped() to dil.Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 530 diff changeset	4012 if (skipped(T.Assign))
137 b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4013 defValue = parseCondExpression();
340 1accb3013bd2 - Changed class TemplateParameter to an abstract class. aziz parents: 335 diff changeset	4014 tp = new TemplateValueParameter(valueType, ident, specValue, defValue);
137 b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4015 }
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4016
340 1accb3013bd2 - Changed class TemplateParameter to an abstract class. aziz parents: 335 diff changeset	4017 // Push template parameter.
1accb3013bd2 - Changed class TemplateParameter to an abstract class. aziz parents: 335 diff changeset	4018 tparams ~= set(tp, paramBegin);
137 b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4019
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4020 if (token.type != T.Comma)
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4021 break;
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4022 nT();
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4023 }
258 112a57f433f2 - Created class TemplateParameters. aziz parents: 257 diff changeset	4024 set(tparams, begin);
137 b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4025 return tparams;
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4026 }
b49903801f14 - Implemented parseTemplateParameters(). aziz parents: 136 diff changeset	4027
124 d4c4cea6ee7f - Renamed method errorIfNot() to expected(). aziz parents: 123 diff changeset	4028 void expected(TOK tok)
86 0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	4029 {
87 c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	4030 if (token.type != tok)
327 a48a987f7515 - Added package dil to import declarations. aziz parents: 326 diff changeset	4031 error(MID.ExpectedButFound, Token.toString(tok), token.srcText);
86 0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	4032 }
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	4033
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	4034 void require(TOK tok)
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	4035 {
87 c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token. aziz parents: 86 diff changeset	4036 if (token.type == tok)
86 0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	4037 nT();
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	4038 else
327 a48a987f7515 - Added package dil to import declarations. aziz parents: 326 diff changeset	4039 error(MID.ExpectedButFound, Token.toString(tok), token.srcText);
86 0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	4040 }
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	4041
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	4042 void requireNext(TOK tok)
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	4043 {
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	4044 nT();
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	4045 require(tok);
86 0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	4046 }
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions. aziz parents: 85 diff changeset	4047
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	4048 Identifier* optionalIdentifier()
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	4049 {
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	4050 Identifier* id;
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	4051 if (token.type == T.Identifier)
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	4052 (id = token.ident), nT();
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	4053 return id;
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	4054 }
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	4055
504 9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 502 diff changeset	4056 Identifier* requireIdentifier()
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 502 diff changeset	4057 {
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 502 diff changeset	4058 Identifier* id;
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 502 diff changeset	4059 if (token.type == T.Identifier)
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 502 diff changeset	4060 (id = token.ident), nT();
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 502 diff changeset	4061 else
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 502 diff changeset	4062 error(MID.ExpectedButFound, "Identifier", token.srcText);
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 502 diff changeset	4063 return id;
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 502 diff changeset	4064 }
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 502 diff changeset	4065
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 502 diff changeset	4066 /++
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 502 diff changeset	4067 Params:
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 502 diff changeset	4068 errorMsg = an error that has no message ID yet.
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 502 diff changeset	4069 +/
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 502 diff changeset	4070 Identifier* requireIdentifier(char[] errorMsg)
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 502 diff changeset	4071 {
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 502 diff changeset	4072 Identifier* id;
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 502 diff changeset	4073 if (token.type == T.Identifier)
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 502 diff changeset	4074 (id = token.ident), nT();
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 502 diff changeset	4075 else
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 502 diff changeset	4076 error(token, errorMsg, token.srcText);
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 502 diff changeset	4077 return id;
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 502 diff changeset	4078 }
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 502 diff changeset	4079
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 502 diff changeset	4080 Identifier* requireIdentifier(MID mid)
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 502 diff changeset	4081 {
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 502 diff changeset	4082 Identifier* id;
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 502 diff changeset	4083 if (token.type == T.Identifier)
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 502 diff changeset	4084 (id = token.ident), nT();
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 502 diff changeset	4085 else
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 502 diff changeset	4086 error(mid, token.srcText);
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 502 diff changeset	4087 return id;
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 502 diff changeset	4088 }
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 502 diff changeset	4089
243 461e544ebb53 - Added method requireId(). aziz parents: 242 diff changeset	4090 Token* requireId()
461e544ebb53 - Added method requireId(). aziz parents: 242 diff changeset	4091 {
461e544ebb53 - Added method requireId(). aziz parents: 242 diff changeset	4092 if (token.type == T.Identifier)
461e544ebb53 - Added method requireId(). aziz parents: 242 diff changeset	4093 {
461e544ebb53 - Added method requireId(). aziz parents: 242 diff changeset	4094 auto id = token;
461e544ebb53 - Added method requireId(). aziz parents: 242 diff changeset	4095 nT();
461e544ebb53 - Added method requireId(). aziz parents: 242 diff changeset	4096 return id;
461e544ebb53 - Added method requireId(). aziz parents: 242 diff changeset	4097 }
461e544ebb53 - Added method requireId(). aziz parents: 242 diff changeset	4098 else
461e544ebb53 - Added method requireId(). aziz parents: 242 diff changeset	4099 error(MID.ExpectedButFound, "Identifier", token.srcText);
461e544ebb53 - Added method requireId(). aziz parents: 242 diff changeset	4100 return null;
461e544ebb53 - Added method requireId(). aziz parents: 242 diff changeset	4101 }
461e544ebb53 - Added method requireId(). aziz parents: 242 diff changeset	4102
505 3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	4103 Token* requireIdToken(char[] errorMsg)
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	4104 {
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	4105 Token* idtok;
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	4106 if (token.type == T.Identifier)
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	4107 (idtok = token), nT();
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	4108 else
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	4109 error(token, errorMsg, token.srcText);
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	4110 return idtok;
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	4111 }
3bb94ba21490 Refactored a great amount of code. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 504 diff changeset	4112
496 5a607597dc22 Improved error recovery in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 495 diff changeset	4113 /// Reports an error that has no message ID yet.
5a607597dc22 Improved error recovery in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 495 diff changeset	4114 void error(Token* token, char[] formatMsg, ...)
5a607597dc22 Improved error recovery in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 495 diff changeset	4115 {
514 6ddff941862a Added new error classes. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 511 diff changeset	4116 error_(token, formatMsg, _arguments, _argptr);
496 5a607597dc22 Improved error recovery in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 495 diff changeset	4117 }
5a607597dc22 Improved error recovery in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 495 diff changeset	4118
391 33b566df6af4 Migrated project to Tango. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 379 diff changeset	4119 void error(MID mid, ...)
71 b3777cca323c - Added Identity and NotIdentity tokens. aziz parents: 70 diff changeset	4120 {
514 6ddff941862a Added new error classes. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 511 diff changeset	4121 error_(this.token, GetMsg(mid), _arguments, _argptr);
496 5a607597dc22 Improved error recovery in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 495 diff changeset	4122 }
5a607597dc22 Improved error recovery in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 495 diff changeset	4123
514 6ddff941862a Added new error classes. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 511 diff changeset	4124 void error_(Token* token, char[] formatMsg, TypeInfo[] _arguments, void* _argptr)
496 5a607597dc22 Improved error recovery in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 495 diff changeset	4125 {
213 b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	4126 if (trying)
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	4127 {
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	4128 ++errorCount;
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	4129 return;
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser. aziz parents: 206 diff changeset	4130 }
496 5a607597dc22 Improved error recovery in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 495 diff changeset	4131 auto location = token.getLocation();
5a607597dc22 Improved error recovery in the Parser. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 495 diff changeset	4132 auto msg = Format(_arguments, _argptr, formatMsg);
520 f203c5248d0b Added 'compile' command. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 519 diff changeset	4133 auto error = new ParserError(location, msg);
f203c5248d0b Added 'compile' command. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 519 diff changeset	4134 errors ~= error;
f203c5248d0b Added 'compile' command. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 519 diff changeset	4135 if (infoMan !is null)
f203c5248d0b Added 'compile' command. Aziz K?ksal <aziz.koeksal@gmail.com> parents: 519 diff changeset	4136 infoMan ~= error;
71 b3777cca323c - Added Identity and NotIdentity tokens. aziz parents: 70 diff changeset	4137 }
65 6c21ae79fbb3 - Renamed function Token.span to Token.srcText. aziz parents: 0 diff changeset	4138 }

Mercurial > projects > dil

annotate trunk/src/dil/parser/Parser.d @ 673:64fec49651cf