projects/ldc: dmd2/parse.c annotate

annotate dmd2/parse.c @ 1650:40bd4a0d4870

Update to work with LLVM 2.7. Removed use of dyn_cast, llvm no compiles without exceptions and rtti by default. We do need exceptions for the libconfig stuff, but rtti isn't necessary (anymore). Debug info needs to be rewritten, as in LLVM 2.7 the format has completely changed. To have something to look at while rewriting, the old code has been wrapped inside #ifndef DISABLE_DEBUG_INFO , this means that you have to define this to compile at the moment. Updated tango 0.99.9 patch to include updated EH runtime code, which is needed for LLVM 2.7 as well.

author	Tomas Lindquist Olsen
date	Wed, 19 May 2010 12:42:32 +0200
parents	e4f7b5d9c68a
children

rev	line source
1452 638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2 // Compiler implementation of the D programming language
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3 // Copyright (c) 1999-2009 by Digital Mars
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4 // All Rights Reserved
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5 // written by Walter Bright
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	6 // http://www.digitalmars.com
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	7 // License for redistribution is by either the Artistic License
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	8 // in artistic.txt, or the GNU General Public License in gnu.txt.
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	9 // See the included readme.txt for details.
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	10
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	11 // This is the D parser
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	12
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	13 #include <stdio.h>
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	14 #include <assert.h>
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	15
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	16 #include "rmem.h"
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	17 #include "lexer.h"
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	18 #include "parse.h"
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	19 #include "init.h"
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	20 #include "attrib.h"
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	21 #include "cond.h"
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	22 #include "mtype.h"
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	23 #include "template.h"
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	24 #include "staticassert.h"
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	25 #include "expression.h"
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	26 #include "statement.h"
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	27 #include "module.h"
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	28 #include "dsymbol.h"
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	29 #include "import.h"
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	30 #include "declaration.h"
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	31 #include "aggregate.h"
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	32 #include "enum.h"
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	33 #include "id.h"
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	34 #include "version.h"
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	35 #include "aliasthis.h"
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	36
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	37 // How multiple declarations are parsed.
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	38 // If 1, treat as C.
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	39 // If 0, treat:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	40 // int *p, i;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	41 // as:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	42 // int* p;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	43 // int* i;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	44 #define CDECLSYNTAX 0
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	45
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	46 // Support C cast syntax:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	47 // (type)(expression)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	48 #define CCASTSYNTAX 1
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	49
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	50 // Support postfix C array declarations, such as
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	51 // int a[3][4];
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	52 #define CARRAYDECL 1
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	53
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	54
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	55 Parser::Parser(Module module, unsigned char base, unsigned length, int doDocComment)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	56 : Lexer(module, base, 0, length, doDocComment, 0)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	57 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	58 //printf("Parser::Parser()\n");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	59 md = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	60 linkage = LINKd;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	61 endloc = 0;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	62 inBrackets = 0;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	63 //nextToken(); // start up the scanner
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	64 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	65
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	66 Array *Parser::parseModule()
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	67 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	68 Array *decldefs;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	69
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	70 // ModuleDeclation leads off
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	71 if (token.value == TOKmodule)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	72 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	73 unsigned char *comment = token.blockComment;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	74 bool safe = FALSE;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	75
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	76 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	77 #if DMDV2
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	78 if (token.value == TOKlparen)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	79 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	80 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	81 if (token.value != TOKidentifier)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	82 { error("module (system) identifier expected");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	83 goto Lerr;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	84 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	85 Identifier *id = token.ident;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	86
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	87 if (id == Id::system)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	88 safe = TRUE;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	89 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	90 error("(safe) expected, not %s", id->toChars());
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	91 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	92 check(TOKrparen);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	93 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	94 #endif
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	95
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	96 if (token.value != TOKidentifier)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	97 { error("Identifier expected following module");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	98 goto Lerr;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	99 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	100 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	101 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	102 Array *a = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	103 Identifier *id;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	104
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	105 id = token.ident;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	106 while (nextToken() == TOKdot)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	107 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	108 if (!a)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	109 a = new Array();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	110 a->push(id);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	111 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	112 if (token.value != TOKidentifier)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	113 { error("Identifier expected following package");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	114 goto Lerr;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	115 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	116 id = token.ident;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	117 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	118
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	119 md = new ModuleDeclaration(a, id, safe);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	120
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	121 if (token.value != TOKsemicolon)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	122 error("';' expected following module declaration instead of %s", token.toChars());
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	123 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	124 addComment(mod, comment);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	125 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	126 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	127
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	128 decldefs = parseDeclDefs(0);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	129 if (token.value != TOKeof)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	130 { error("unrecognized declaration");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	131 goto Lerr;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	132 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	133 return decldefs;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	134
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	135 Lerr:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	136 while (token.value != TOKsemicolon && token.value != TOKeof)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	137 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	138 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	139 return new Array();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	140 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	141
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	142 Array *Parser::parseDeclDefs(int once)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	143 { Dsymbol *s;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	144 Array *decldefs;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	145 Array *a;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	146 Array *aelse;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	147 enum PROT prot;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	148 enum STC stc;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	149 unsigned storageClass;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	150 Condition *condition;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	151 unsigned char *comment;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	152
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	153 //printf("Parser::parseDeclDefs()\n");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	154 decldefs = new Array();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	155 do
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	156 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	157 comment = token.blockComment;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	158 storageClass = STCundefined;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	159 switch (token.value)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	160 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	161 case TOKenum:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	162 { /* Determine if this is a manifest constant declaration,
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	163 * or a conventional enum.
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	164 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	165 Token *t = peek(&token);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	166 if (t->value == TOKlcurly \|\| t->value == TOKcolon)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	167 s = parseEnum();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	168 else if (t->value != TOKidentifier)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	169 goto Ldeclaration;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	170 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	171 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	172 t = peek(t);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	173 if (t->value == TOKlcurly \|\| t->value == TOKcolon \|\|
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	174 t->value == TOKsemicolon)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	175 s = parseEnum();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	176 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	177 goto Ldeclaration;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	178 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	179 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	180 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	181
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	182 case TOKstruct:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	183 case TOKunion:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	184 case TOKclass:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	185 case TOKinterface:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	186 s = parseAggregate();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	187 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	188
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	189 case TOKimport:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	190 s = parseImport(decldefs, 0);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	191 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	192
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	193 case TOKtemplate:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	194 s = (Dsymbol *)parseTemplateDeclaration();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	195 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	196
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	197 case TOKmixin:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	198 { Loc loc = this->loc;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	199 if (peek(&token)->value == TOKlparen)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	200 { // mixin(string)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	201 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	202 check(TOKlparen, "mixin");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	203 Expression *e = parseAssignExp();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	204 check(TOKrparen);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	205 check(TOKsemicolon);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	206 s = new CompileDeclaration(loc, e);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	207 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	208 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	209 s = parseMixin();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	210 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	211 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	212
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	213 CASE_BASIC_TYPES:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	214 case TOKalias:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	215 case TOKtypedef:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	216 case TOKidentifier:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	217 case TOKtypeof:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	218 case TOKdot:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	219 Ldeclaration:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	220 a = parseDeclarations(STCundefined);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	221 decldefs->append(a);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	222 continue;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	223
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	224 case TOKthis:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	225 s = parseCtor();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	226 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	227
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	228 #if 0 // dead end, use this(this){} instead
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	229 case TOKassign:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	230 s = parsePostBlit();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	231 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	232 #endif
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	233 case TOKtilde:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	234 s = parseDtor();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	235 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	236
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	237 case TOKinvariant:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	238 { Token *t;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	239 t = peek(&token);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	240 if (t->value == TOKlparen)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	241 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	242 if (peek(t)->value == TOKrparen)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	243 // invariant() forms start of class invariant
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	244 s = parseInvariant();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	245 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	246 // invariant(type)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	247 goto Ldeclaration;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	248 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	249 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	250 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	251 stc = STCimmutable;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	252 goto Lstc;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	253 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	254 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	255 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	256
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	257 case TOKunittest:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	258 s = parseUnitTest();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	259 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	260
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	261 case TOKnew:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	262 s = parseNew();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	263 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	264
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	265 case TOKdelete:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	266 s = parseDelete();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	267 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	268
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	269 case TOKeof:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	270 case TOKrcurly:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	271 return decldefs;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	272
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	273 case TOKstatic:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	274 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	275 if (token.value == TOKthis)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	276 s = parseStaticCtor();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	277 else if (token.value == TOKtilde)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	278 s = parseStaticDtor();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	279 else if (token.value == TOKassert)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	280 s = parseStaticAssert();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	281 else if (token.value == TOKif)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	282 { condition = parseStaticIfCondition();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	283 a = parseBlock();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	284 aelse = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	285 if (token.value == TOKelse)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	286 { nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	287 aelse = parseBlock();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	288 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	289 s = new StaticIfDeclaration(condition, a, aelse);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	290 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	291 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	292 else if (token.value == TOKimport)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	293 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	294 s = parseImport(decldefs, 1);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	295 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	296 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	297 { stc = STCstatic;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	298 goto Lstc2;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	299 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	300 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	301
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	302 case TOKconst:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	303 if (peek(&token)->value == TOKlparen)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	304 goto Ldeclaration;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	305 stc = STCconst;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	306 goto Lstc;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	307
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	308 case TOKimmutable:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	309 if (peek(&token)->value == TOKlparen)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	310 goto Ldeclaration;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	311 stc = STCimmutable;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	312 goto Lstc;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	313
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	314 case TOKshared:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	315 if (peek(&token)->value == TOKlparen)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	316 goto Ldeclaration;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	317 stc = STCshared;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	318 goto Lstc;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	319
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	320 case TOKfinal: stc = STCfinal; goto Lstc;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	321 case TOKauto: stc = STCauto; goto Lstc;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	322 case TOKscope: stc = STCscope; goto Lstc;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	323 case TOKoverride: stc = STCoverride; goto Lstc;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	324 case TOKabstract: stc = STCabstract; goto Lstc;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	325 case TOKsynchronized: stc = STCsynchronized; goto Lstc;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	326 case TOKdeprecated: stc = STCdeprecated; goto Lstc;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	327 #if DMDV2
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	328 case TOKnothrow: stc = STCnothrow; goto Lstc;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	329 case TOKpure: stc = STCpure; goto Lstc;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	330 case TOKref: stc = STCref; goto Lstc;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	331 case TOKtls: stc = STCtls; goto Lstc;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	332 case TOKgshared: stc = STCgshared; goto Lstc;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	333 //case TOKmanifest: stc = STCmanifest; goto Lstc;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	334 #endif
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	335
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	336 Lstc:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	337 if (storageClass & stc)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	338 error("redundant storage class %s", Token::toChars(token.value));
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	339 composeStorageClass(storageClass \| stc);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	340 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	341 Lstc2:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	342 storageClass \|= stc;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	343 switch (token.value)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	344 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	345 case TOKconst:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	346 case TOKinvariant:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	347 case TOKimmutable:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	348 case TOKshared:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	349 // If followed by a (, it is not a storage class
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	350 if (peek(&token)->value == TOKlparen)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	351 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	352 if (token.value == TOKconst)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	353 stc = STCconst;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	354 else if (token.value == TOKshared)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	355 stc = STCshared;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	356 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	357 stc = STCimmutable;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	358 goto Lstc;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	359 case TOKfinal: stc = STCfinal; goto Lstc;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	360 case TOKauto: stc = STCauto; goto Lstc;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	361 case TOKscope: stc = STCscope; goto Lstc;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	362 case TOKoverride: stc = STCoverride; goto Lstc;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	363 case TOKabstract: stc = STCabstract; goto Lstc;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	364 case TOKsynchronized: stc = STCsynchronized; goto Lstc;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	365 case TOKdeprecated: stc = STCdeprecated; goto Lstc;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	366 case TOKnothrow: stc = STCnothrow; goto Lstc;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	367 case TOKpure: stc = STCpure; goto Lstc;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	368 case TOKref: stc = STCref; goto Lstc;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	369 case TOKtls: stc = STCtls; goto Lstc;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	370 case TOKgshared: stc = STCgshared; goto Lstc;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	371 //case TOKmanifest: stc = STCmanifest; goto Lstc;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	372 default:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	373 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	374 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	375
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	376 /* Look for auto initializers:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	377 * storage_class identifier = initializer;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	378 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	379 if (token.value == TOKidentifier &&
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	380 peek(&token)->value == TOKassign)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	381 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	382 a = parseAutoDeclarations(storageClass, comment);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	383 decldefs->append(a);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	384 continue;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	385 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	386
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	387 /* Look for return type inference for template functions.
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	388 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	389 Token *tk;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	390 if (token.value == TOKidentifier &&
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	391 (tk = peek(&token))->value == TOKlparen &&
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	392 skipParens(tk, &tk) &&
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	393 (peek(tk)->value == TOKlparen \|\|
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	394 peek(tk)->value == TOKlcurly)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	395 )
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	396 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	397 a = parseDeclarations(storageClass);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	398 decldefs->append(a);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	399 continue;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	400 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	401 a = parseBlock();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	402 s = new StorageClassDeclaration(storageClass, a);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	403 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	404
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	405 case TOKextern:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	406 if (peek(&token)->value != TOKlparen)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	407 { stc = STCextern;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	408 goto Lstc;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	409 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	410 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	411 enum LINK linksave = linkage;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	412 linkage = parseLinkage();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	413 a = parseBlock();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	414 s = new LinkDeclaration(linkage, a);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	415 linkage = linksave;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	416 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	417 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	418 case TOKprivate: prot = PROTprivate; goto Lprot;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	419 case TOKpackage: prot = PROTpackage; goto Lprot;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	420 case TOKprotected: prot = PROTprotected; goto Lprot;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	421 case TOKpublic: prot = PROTpublic; goto Lprot;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	422 case TOKexport: prot = PROTexport; goto Lprot;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	423
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	424 Lprot:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	425 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	426 switch (token.value)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	427 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	428 case TOKprivate:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	429 case TOKpackage:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	430 case TOKprotected:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	431 case TOKpublic:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	432 case TOKexport:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	433 error("redundant protection attribute");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	434 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	435 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	436 a = parseBlock();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	437 s = new ProtDeclaration(prot, a);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	438 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	439
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	440 case TOKalign:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	441 { unsigned n;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	442
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	443 // LDC better align code locations
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	444 Loc alignloc = loc;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	445
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	446 s = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	447 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	448 if (token.value == TOKlparen)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	449 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	450 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	451 if (token.value == TOKint32v)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	452 n = (unsigned)token.uns64value;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	453 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	454 { error("integer expected, not %s", token.toChars());
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	455 n = 1;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	456 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	457 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	458 check(TOKrparen);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	459 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	460 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	461 n = global.structalign; // default
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	462
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	463 a = parseBlock();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	464 s = new AlignDeclaration(alignloc, n, a);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	465 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	466 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	467
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	468 case TOKpragma:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	469 { Identifier *ident;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	470 Expressions *args = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	471
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	472 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	473 check(TOKlparen);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	474 if (token.value != TOKidentifier)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	475 { error("pragma(identifier expected");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	476 goto Lerror;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	477 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	478 ident = token.ident;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	479 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	480 if (token.value == TOKcomma && peekNext() != TOKrparen)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	481 args = parseArguments(); // pragma(identifier, args...)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	482 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	483 check(TOKrparen); // pragma(identifier)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	484
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	485 if (token.value == TOKsemicolon)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	486 a = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	487 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	488 a = parseBlock();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	489 s = new PragmaDeclaration(loc, ident, args, a);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	490 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	491 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	492
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	493 case TOKdebug:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	494 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	495 if (token.value == TOKassign)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	496 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	497 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	498 if (token.value == TOKidentifier)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	499 s = new DebugSymbol(loc, token.ident);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	500 else if (token.value == TOKint32v)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	501 s = new DebugSymbol(loc, (unsigned)token.uns64value);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	502 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	503 { error("identifier or integer expected, not %s", token.toChars());
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	504 s = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	505 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	506 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	507 if (token.value != TOKsemicolon)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	508 error("semicolon expected");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	509 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	510 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	511 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	512
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	513 condition = parseDebugCondition();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	514 goto Lcondition;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	515
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	516 case TOKversion:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	517 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	518 if (token.value == TOKassign)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	519 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	520 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	521 if (token.value == TOKidentifier)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	522 s = new VersionSymbol(loc, token.ident);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	523 else if (token.value == TOKint32v)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	524 s = new VersionSymbol(loc, (unsigned)token.uns64value);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	525 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	526 { error("identifier or integer expected, not %s", token.toChars());
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	527 s = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	528 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	529 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	530 if (token.value != TOKsemicolon)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	531 error("semicolon expected");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	532 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	533 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	534 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	535 condition = parseVersionCondition();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	536 goto Lcondition;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	537
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	538 Lcondition:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	539 a = parseBlock();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	540 aelse = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	541 if (token.value == TOKelse)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	542 { nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	543 aelse = parseBlock();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	544 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	545 s = new ConditionalDeclaration(condition, a, aelse);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	546 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	547
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	548 case TOKsemicolon: // empty declaration
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	549 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	550 continue;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	551
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	552 default:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	553 error("Declaration expected, not '%s'",token.toChars());
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	554 Lerror:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	555 while (token.value != TOKsemicolon && token.value != TOKeof)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	556 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	557 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	558 s = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	559 continue;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	560 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	561 if (s)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	562 { decldefs->push(s);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	563 addComment(s, comment);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	564 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	565 } while (!once);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	566 return decldefs;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	567 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	568
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	569 /*********************************************
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	570 * Give error on conflicting storage classes.
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	571 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	572
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	573 void Parser::composeStorageClass(unsigned stc)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	574 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	575 unsigned u = stc;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	576 u &= STCconst \| STCimmutable \| STCmanifest;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	577 if (u & (u - 1))
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	578 error("conflicting storage class %s", Token::toChars(token.value));
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	579 u = stc;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	580 u &= STCgshared \| STCshared \| STCtls;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	581 if (u & (u - 1))
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	582 error("conflicting storage class %s", Token::toChars(token.value));
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	583 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	584
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	585 /********************************************
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	586 * Parse declarations after an align, protection, or extern decl.
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	587 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	588
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	589 Array *Parser::parseBlock()
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	590 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	591 Array *a = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	592 Dsymbol *s;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	593
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	594 //printf("parseBlock()\n");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	595 switch (token.value)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	596 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	597 case TOKsemicolon:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	598 error("declaration expected following attribute, not ';'");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	599 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	600 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	601
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	602 case TOKeof:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	603 error("declaration expected following attribute, not EOF");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	604 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	605
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	606 case TOKlcurly:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	607 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	608 a = parseDeclDefs(0);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	609 if (token.value != TOKrcurly)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	610 { /* { */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	611 error("matching '}' expected, not %s", token.toChars());
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	612 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	613 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	614 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	615 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	616
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	617 case TOKcolon:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	618 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	619 #if 0
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	620 a = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	621 #else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	622 a = parseDeclDefs(0); // grab declarations up to closing curly bracket
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	623 #endif
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	624 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	625
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	626 default:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	627 a = parseDeclDefs(1);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	628 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	629 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	630 return a;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	631 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	632
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	633 /**********************************
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	634 * Parse a static assertion.
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	635 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	636
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	637 StaticAssert *Parser::parseStaticAssert()
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	638 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	639 Loc loc = this->loc;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	640 Expression *exp;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	641 Expression *msg = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	642
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	643 //printf("parseStaticAssert()\n");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	644 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	645 check(TOKlparen);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	646 exp = parseAssignExp();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	647 if (token.value == TOKcomma)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	648 { nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	649 msg = parseAssignExp();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	650 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	651 check(TOKrparen);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	652 check(TOKsemicolon);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	653 return new StaticAssert(loc, exp, msg);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	654 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	655
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	656 /***********************************
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	657 * Parse typeof(expression).
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	658 * Current token is on the 'typeof'.
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	659 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	660
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	661 #if DMDV2
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	662 TypeQualified *Parser::parseTypeof()
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	663 { TypeQualified *t;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	664 Loc loc = this->loc;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	665
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	666 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	667 check(TOKlparen);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	668 if (token.value == TOKreturn) // typeof(return)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	669 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	670 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	671 t = new TypeReturn(loc);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	672 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	673 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	674 { Expression *exp = parseExpression(); // typeof(expression)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	675 t = new TypeTypeof(loc, exp);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	676 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	677 check(TOKrparen);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	678 return t;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	679 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	680 #endif
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	681
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	682 /***********************************
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	683 * Parse extern (linkage)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	684 * The parser is on the 'extern' token.
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	685 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	686
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	687 enum LINK Parser::parseLinkage()
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	688 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	689 enum LINK link = LINKdefault;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	690 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	691 assert(token.value == TOKlparen);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	692 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	693 if (token.value == TOKidentifier)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	694 { Identifier *id = token.ident;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	695
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	696 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	697 if (id == Id::Windows)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	698 link = LINKwindows;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	699 else if (id == Id::Pascal)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	700 link = LINKpascal;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	701 else if (id == Id::D)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	702 link = LINKd;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	703 else if (id == Id::C)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	704 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	705 link = LINKc;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	706 if (token.value == TOKplusplus)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	707 { link = LINKcpp;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	708 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	709 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	710 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	711 else if (id == Id::System)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	712 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	713 // LDC we configure target at runtime
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	714 if (global.params.os == OSWindows)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	715 link = LINKwindows;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	716 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	717 link = LINKc;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	718 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	719 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	720 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	721 error("valid linkage identifiers are D, C, C++, Pascal, Windows, System");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	722 link = LINKd;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	723 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	724 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	725 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	726 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	727 link = LINKd; // default
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	728 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	729 check(TOKrparen);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	730 return link;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	731 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	732
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	733 /**************************************
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	734 * Parse a debug conditional
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	735 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	736
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	737 Condition *Parser::parseDebugCondition()
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	738 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	739 Condition *c;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	740
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	741 if (token.value == TOKlparen)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	742 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	743 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	744 unsigned level = 1;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	745 Identifier *id = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	746
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	747 if (token.value == TOKidentifier)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	748 id = token.ident;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	749 else if (token.value == TOKint32v)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	750 level = (unsigned)token.uns64value;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	751 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	752 error("identifier or integer expected, not %s", token.toChars());
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	753 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	754 check(TOKrparen);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	755 c = new DebugCondition(mod, level, id);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	756 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	757 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	758 c = new DebugCondition(mod, 1, NULL);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	759 return c;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	760
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	761 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	762
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	763 /**************************************
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	764 * Parse a version conditional
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	765 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	766
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	767 Condition *Parser::parseVersionCondition()
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	768 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	769 Condition *c;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	770 unsigned level = 1;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	771 Identifier *id = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	772
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	773 if (token.value == TOKlparen)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	774 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	775 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	776 if (token.value == TOKidentifier)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	777 id = token.ident;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	778 else if (token.value == TOKint32v)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	779 level = (unsigned)token.uns64value;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	780 #if DMDV2
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	781 /* Allow:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	782 * version (unittest)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	783 * even though unittest is a keyword
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	784 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	785 else if (token.value == TOKunittest)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	786 id = Lexer::idPool(Token::toChars(TOKunittest));
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	787 #endif
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	788 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	789 error("identifier or integer expected, not %s", token.toChars());
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	790 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	791 check(TOKrparen);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	792
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	793 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	794 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	795 error("(condition) expected following version");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	796 c = new VersionCondition(mod, level, id);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	797 return c;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	798
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	799 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	800
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	801 /***********************************************
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	802 * static if (expression)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	803 * body
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	804 * else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	805 * body
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	806 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	807
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	808 Condition *Parser::parseStaticIfCondition()
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	809 { Expression *exp;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	810 Condition *condition;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	811 Array *aif;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	812 Array *aelse;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	813 Loc loc = this->loc;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	814
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	815 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	816 if (token.value == TOKlparen)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	817 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	818 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	819 exp = parseAssignExp();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	820 check(TOKrparen);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	821 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	822 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	823 { error("(expression) expected following static if");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	824 exp = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	825 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	826 condition = new StaticIfCondition(loc, exp);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	827 return condition;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	828 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	829
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	830
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	831 /*****************************************
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	832 * Parse a constructor definition:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	833 * this(parameters) { body }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	834 * or postblit:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	835 * this(this) { body }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	836 * or constructor template:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	837 * this(templateparameters)(parameters) { body }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	838 * Current token is 'this'.
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	839 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	840
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	841 Dsymbol *Parser::parseCtor()
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	842 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	843 Loc loc = this->loc;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	844
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	845 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	846 if (token.value == TOKlparen && peek(&token)->value == TOKthis)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	847 { // this(this) { ... }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	848 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	849 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	850 check(TOKrparen);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	851 PostBlitDeclaration *f = new PostBlitDeclaration(loc, 0);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	852 parseContracts(f);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	853 return f;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	854 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	855
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	856 /* Look ahead to see if:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	857 * this(...)(...)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	858 * which is a constructor template
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	859 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	860 TemplateParameters *tpl = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	861 if (token.value == TOKlparen && peekPastParen(&token)->value == TOKlparen)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	862 { tpl = parseTemplateParameterList();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	863
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	864 int varargs;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	865 Arguments *arguments = parseParameters(&varargs);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	866
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	867 Expression *constraint = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	868 if (tpl)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	869 constraint = parseConstraint();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	870
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	871 CtorDeclaration *f = new CtorDeclaration(loc, 0, arguments, varargs);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	872 parseContracts(f);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	873
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	874 // Wrap a template around it
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	875 Array *decldefs = new Array();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	876 decldefs->push(f);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	877 TemplateDeclaration *tempdecl =
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	878 new TemplateDeclaration(loc, f->ident, tpl, constraint, decldefs);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	879 return tempdecl;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	880 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	881
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	882 /* Just a regular constructor
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	883 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	884 int varargs;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	885 Arguments *arguments = parseParameters(&varargs);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	886 CtorDeclaration *f = new CtorDeclaration(loc, 0, arguments, varargs);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	887 parseContracts(f);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	888 return f;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	889 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	890
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	891 /*****************************************
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	892 * Parse a postblit definition:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	893 * =this() { body }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	894 * Current token is '='.
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	895 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	896
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	897 PostBlitDeclaration *Parser::parsePostBlit()
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	898 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	899 Loc loc = this->loc;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	900
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	901 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	902 check(TOKthis);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	903 check(TOKlparen);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	904 check(TOKrparen);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	905
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	906 PostBlitDeclaration *f = new PostBlitDeclaration(loc, 0);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	907 parseContracts(f);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	908 return f;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	909 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	910
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	911 /*****************************************
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	912 * Parse a destructor definition:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	913 * ~this() { body }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	914 * Current token is '~'.
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	915 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	916
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	917 DtorDeclaration *Parser::parseDtor()
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	918 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	919 DtorDeclaration *f;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	920 Loc loc = this->loc;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	921
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	922 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	923 check(TOKthis);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	924 check(TOKlparen);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	925 check(TOKrparen);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	926
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	927 f = new DtorDeclaration(loc, 0);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	928 parseContracts(f);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	929 return f;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	930 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	931
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	932 /*****************************************
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	933 * Parse a static constructor definition:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	934 * static this() { body }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	935 * Current token is 'this'.
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	936 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	937
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	938 StaticCtorDeclaration *Parser::parseStaticCtor()
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	939 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	940 StaticCtorDeclaration *f;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	941 Loc loc = this->loc;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	942
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	943 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	944 check(TOKlparen);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	945 check(TOKrparen);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	946
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	947 f = new StaticCtorDeclaration(loc, 0);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	948 parseContracts(f);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	949 return f;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	950 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	951
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	952 /*****************************************
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	953 * Parse a static destructor definition:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	954 * static ~this() { body }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	955 * Current token is '~'.
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	956 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	957
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	958 StaticDtorDeclaration *Parser::parseStaticDtor()
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	959 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	960 StaticDtorDeclaration *f;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	961 Loc loc = this->loc;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	962
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	963 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	964 check(TOKthis);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	965 check(TOKlparen);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	966 check(TOKrparen);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	967
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	968 f = new StaticDtorDeclaration(loc, 0);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	969 parseContracts(f);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	970 return f;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	971 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	972
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	973 /*****************************************
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	974 * Parse an invariant definition:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	975 * invariant() { body }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	976 * Current token is 'invariant'.
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	977 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	978
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	979 InvariantDeclaration *Parser::parseInvariant()
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	980 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	981 InvariantDeclaration *f;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	982 Loc loc = this->loc;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	983
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	984 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	985 if (token.value == TOKlparen) // optional ()
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	986 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	987 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	988 check(TOKrparen);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	989 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	990
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	991 f = new InvariantDeclaration(loc, 0);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	992 f->fbody = parseStatement(PScurly);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	993 return f;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	994 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	995
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	996 /*****************************************
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	997 * Parse a unittest definition:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	998 * unittest { body }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	999 * Current token is 'unittest'.
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1000 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1001
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1002 UnitTestDeclaration *Parser::parseUnitTest()
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1003 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1004 UnitTestDeclaration *f;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1005 Statement *body;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1006 Loc loc = this->loc;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1007
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1008 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1009
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1010 body = parseStatement(PScurly);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1011
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1012 f = new UnitTestDeclaration(loc, this->loc);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1013 f->fbody = body;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1014 return f;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1015 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1016
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1017 /*****************************************
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1018 * Parse a new definition:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1019 * new(arguments) { body }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1020 * Current token is 'new'.
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1021 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1022
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1023 NewDeclaration *Parser::parseNew()
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1024 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1025 NewDeclaration *f;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1026 Arguments *arguments;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1027 int varargs;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1028 Loc loc = this->loc;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1029
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1030 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1031 arguments = parseParameters(&varargs);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1032 f = new NewDeclaration(loc, 0, arguments, varargs);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1033 parseContracts(f);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1034 return f;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1035 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1036
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1037 /*****************************************
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1038 * Parse a delete definition:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1039 * delete(arguments) { body }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1040 * Current token is 'delete'.
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1041 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1042
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1043 DeleteDeclaration *Parser::parseDelete()
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1044 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1045 DeleteDeclaration *f;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1046 Arguments *arguments;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1047 int varargs;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1048 Loc loc = this->loc;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1049
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1050 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1051 arguments = parseParameters(&varargs);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1052 if (varargs)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1053 error("... not allowed in delete function parameter list");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1054 f = new DeleteDeclaration(loc, 0, arguments);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1055 parseContracts(f);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1056 return f;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1057 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1058
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1059 /**********************************************
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1060 * Parse parameter list.
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1061 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1062
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1063 Arguments Parser::parseParameters(int pvarargs)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1064 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1065 Arguments *arguments = new Arguments();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1066 int varargs = 0;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1067 int hasdefault = 0;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1068
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1069 check(TOKlparen);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1070 while (1)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1071 { Type *tb;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1072 Identifier *ai = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1073 Type *at;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1074 Argument *a;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1075 unsigned storageClass = 0;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1076 unsigned stc;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1077 Expression *ae;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1078
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1079 for (;1; nextToken())
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1080 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1081 switch (token.value)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1082 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1083 case TOKrparen:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1084 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1085
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1086 case TOKdotdotdot:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1087 varargs = 1;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1088 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1089 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1090
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1091 case TOKconst:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1092 if (peek(&token)->value == TOKlparen)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1093 goto Ldefault;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1094 stc = STCconst;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1095 goto L2;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1096
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1097 case TOKinvariant:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1098 case TOKimmutable:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1099 if (peek(&token)->value == TOKlparen)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1100 goto Ldefault;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1101 stc = STCimmutable;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1102 goto L2;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1103
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1104 case TOKshared:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1105 if (peek(&token)->value == TOKlparen)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1106 goto Ldefault;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1107 stc = STCshared;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1108 goto L2;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1109
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1110 case TOKin: stc = STCin; goto L2;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1111 case TOKout: stc = STCout; goto L2;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1112 case TOKinout:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1113 case TOKref: stc = STCref; goto L2;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1114 case TOKlazy: stc = STClazy; goto L2;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1115 case TOKscope: stc = STCscope; goto L2;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1116 case TOKfinal: stc = STCfinal; goto L2;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1117 L2:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1118 if (storageClass & stc \|\|
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1119 (storageClass & STCin && stc & (STCconst \| STCscope)) \|\|
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1120 (stc & STCin && storageClass & (STCconst \| STCscope))
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1121 )
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1122 error("redundant storage class %s", Token::toChars(token.value));
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1123 storageClass \|= stc;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1124 composeStorageClass(storageClass);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1125 continue;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1126
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1127 #if 0
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1128 case TOKstatic: stc = STCstatic; goto L2;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1129 case TOKauto: storageClass = STCauto; goto L4;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1130 case TOKalias: storageClass = STCalias; goto L4;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1131 L4:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1132 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1133 if (token.value == TOKidentifier)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1134 { ai = token.ident;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1135 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1136 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1137 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1138 ai = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1139 at = NULL; // no type
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1140 ae = NULL; // no default argument
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1141 if (token.value == TOKassign) // = defaultArg
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1142 { nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1143 ae = parseDefaultInitExp();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1144 hasdefault = 1;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1145 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1146 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1147 { if (hasdefault)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1148 error("default argument expected for alias %s",
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1149 ai ? ai->toChars() : "");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1150 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1151 goto L3;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1152 #endif
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1153
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1154 default:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1155 Ldefault:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1156 stc = storageClass & (STCin \| STCout \| STCref \| STClazy);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1157 if (stc & (stc - 1)) // if stc is not a power of 2
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1158 error("incompatible parameter storage classes");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1159 if ((storageClass & (STCconst \| STCout)) == (STCconst \| STCout))
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1160 error("out cannot be const");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1161 if ((storageClass & (STCimmutable \| STCout)) == (STCimmutable \| STCout))
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1162 error("out cannot be immutable");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1163 if ((storageClass & STCscope) &&
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1164 (storageClass & (STCref \| STCout)))
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1165 error("scope cannot be ref or out");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1166 at = parseType(&ai);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1167 ae = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1168 if (token.value == TOKassign) // = defaultArg
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1169 { nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1170 ae = parseDefaultInitExp();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1171 hasdefault = 1;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1172 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1173 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1174 { if (hasdefault)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1175 error("default argument expected for %s",
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1176 ai ? ai->toChars() : at->toChars());
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1177 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1178 if (token.value == TOKdotdotdot)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1179 { /* This is:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1180 * at ai ...
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1181 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1182
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1183 if (storageClass & (STCout \| STCref))
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1184 error("variadic argument cannot be out or ref");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1185 varargs = 2;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1186 a = new Argument(storageClass, at, ai, ae);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1187 arguments->push(a);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1188 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1189 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1190 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1191 L3:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1192 a = new Argument(storageClass, at, ai, ae);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1193 arguments->push(a);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1194 if (token.value == TOKcomma)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1195 { nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1196 goto L1;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1197 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1198 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1199 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1200 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1201 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1202 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1203
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1204 L1: ;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1205 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1206 check(TOKrparen);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1207 *pvarargs = varargs;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1208 return arguments;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1209 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1210
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1211
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1212 /*************************************
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1213 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1214
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1215 EnumDeclaration *Parser::parseEnum()
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1216 { EnumDeclaration *e;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1217 Identifier *id;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1218 Type *memtype;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1219 Loc loc = this->loc;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1220
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1221 //printf("Parser::parseEnum()\n");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1222 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1223 if (token.value == TOKidentifier)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1224 { id = token.ident;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1225 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1226 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1227 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1228 id = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1229
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1230 if (token.value == TOKcolon)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1231 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1232 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1233 memtype = parseBasicType();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1234 memtype = parseDeclarator(memtype, NULL, NULL);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1235 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1236 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1237 memtype = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1238
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1239 e = new EnumDeclaration(loc, id, memtype);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1240 if (token.value == TOKsemicolon && id)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1241 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1242 else if (token.value == TOKlcurly)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1243 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1244 //printf("enum definition\n");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1245 e->members = new Array();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1246 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1247 unsigned char *comment = token.blockComment;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1248 while (token.value != TOKrcurly)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1249 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1250 /* Can take the following forms:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1251 * 1. ident
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1252 * 2. ident = value
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1253 * 3. type ident = value
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1254 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1255
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1256 loc = this->loc;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1257
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1258 Type *type = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1259 Identifier *ident;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1260 Token *tp = peek(&token);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1261 if (token.value == TOKidentifier &&
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1262 (tp->value == TOKassign \|\| tp->value == TOKcomma \|\| tp->value == TOKrcurly))
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1263 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1264 ident = token.ident;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1265 type = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1266 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1267 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1268 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1269 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1270 type = parseType(&ident, NULL);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1271 if (id \|\| memtype)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1272 error("type only allowed if anonymous enum and no enum type");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1273 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1274
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1275 Expression *value;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1276 if (token.value == TOKassign)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1277 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1278 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1279 value = parseAssignExp();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1280 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1281 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1282 { value = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1283 if (type)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1284 error("if type, there must be an initializer");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1285 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1286
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1287 EnumMember *em = new EnumMember(loc, ident, value, type);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1288 e->members->push(em);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1289
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1290 if (token.value == TOKrcurly)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1291 ;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1292 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1293 { addComment(em, comment);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1294 comment = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1295 check(TOKcomma);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1296 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1297 addComment(em, comment);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1298 comment = token.blockComment;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1299 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1300 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1301 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1302 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1303 error("enum declaration is invalid");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1304
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1305 //printf("-parseEnum() %s\n", e->toChars());
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1306 return e;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1307 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1308
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1309 /********************************
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1310 * Parse struct, union, interface, class.
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1311 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1312
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1313 Dsymbol *Parser::parseAggregate()
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1314 { AggregateDeclaration *a = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1315 int anon = 0;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1316 enum TOK tok;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1317 Identifier *id;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1318 TemplateParameters *tpl = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1319 Expression *constraint = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1320
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1321 //printf("Parser::parseAggregate()\n");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1322 tok = token.value;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1323 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1324 if (token.value != TOKidentifier)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1325 { id = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1326 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1327 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1328 { id = token.ident;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1329 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1330
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1331 if (token.value == TOKlparen)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1332 { // Class template declaration.
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1333
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1334 // Gather template parameter list
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1335 tpl = parseTemplateParameterList();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1336 constraint = parseConstraint();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1337 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1338 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1339
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1340 Loc loc = this->loc;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1341 switch (tok)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1342 { case TOKclass:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1343 case TOKinterface:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1344 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1345 if (!id)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1346 error("anonymous classes not allowed");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1347
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1348 // Collect base class(es)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1349 BaseClasses *baseclasses = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1350 if (token.value == TOKcolon)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1351 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1352 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1353 baseclasses = parseBaseClasses();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1354
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1355 if (token.value != TOKlcurly)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1356 error("members expected");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1357 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1358
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1359 if (tok == TOKclass)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1360 a = new ClassDeclaration(loc, id, baseclasses);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1361 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1362 a = new InterfaceDeclaration(loc, id, baseclasses);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1363 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1364 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1365
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1366 case TOKstruct:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1367 if (id)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1368 a = new StructDeclaration(loc, id);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1369 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1370 anon = 1;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1371 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1372
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1373 case TOKunion:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1374 if (id)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1375 a = new UnionDeclaration(loc, id);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1376 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1377 anon = 2;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1378 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1379
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1380 default:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1381 assert(0);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1382 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1383 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1384 if (a && token.value == TOKsemicolon)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1385 { nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1386 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1387 else if (token.value == TOKlcurly)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1388 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1389 //printf("aggregate definition\n");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1390 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1391 Array *decl = parseDeclDefs(0);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1392 if (token.value != TOKrcurly)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1393 error("} expected following member declarations in aggregate");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1394 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1395 if (anon)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1396 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1397 /* Anonymous structs/unions are more like attributes.
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1398 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1399 return new AnonDeclaration(loc, anon - 1, decl);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1400 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1401 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1402 a->members = decl;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1403 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1404 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1405 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1406 error("{ } expected following aggregate declaration");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1407 a = new StructDeclaration(loc, NULL);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1408 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1409
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1410 if (tpl)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1411 { // Wrap a template around the aggregate declaration
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1412
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1413 Array *decldefs = new Array();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1414 decldefs->push(a);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1415 TemplateDeclaration *tempdecl =
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1416 new TemplateDeclaration(loc, id, tpl, constraint, decldefs);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1417 return tempdecl;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1418 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1419
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1420 return a;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1421 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1422
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1423 /*******************************************
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1424 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1425
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1426 BaseClasses *Parser::parseBaseClasses()
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1427 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1428 BaseClasses *baseclasses = new BaseClasses();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1429
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1430 for (; 1; nextToken())
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1431 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1432 enum PROT protection = PROTpublic;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1433 switch (token.value)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1434 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1435 case TOKprivate:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1436 protection = PROTprivate;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1437 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1438 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1439 case TOKpackage:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1440 protection = PROTpackage;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1441 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1442 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1443 case TOKprotected:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1444 protection = PROTprotected;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1445 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1446 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1447 case TOKpublic:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1448 protection = PROTpublic;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1449 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1450 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1451 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1452 if (token.value == TOKidentifier)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1453 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1454 BaseClass *b = new BaseClass(parseBasicType(), protection);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1455 baseclasses->push(b);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1456 if (token.value != TOKcomma)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1457 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1458 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1459 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1460 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1461 error("base classes expected instead of %s", token.toChars());
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1462 return NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1463 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1464 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1465 return baseclasses;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1466 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1467
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1468 /**************************************
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1469 * Parse constraint.
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1470 * Constraint is of the form:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1471 * if ( ConstraintExpression )
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1472 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1473
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1474 #if DMDV2
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1475 Expression *Parser::parseConstraint()
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1476 { Expression *e = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1477
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1478 if (token.value == TOKif)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1479 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1480 nextToken(); // skip over 'if'
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1481 check(TOKlparen);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1482 e = parseExpression();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1483 check(TOKrparen);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1484 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1485 return e;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1486 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1487 #endif
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1488
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1489 /**************************************
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1490 * Parse a TemplateDeclaration.
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1491 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1492
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1493 TemplateDeclaration *Parser::parseTemplateDeclaration()
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1494 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1495 TemplateDeclaration *tempdecl;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1496 Identifier *id;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1497 TemplateParameters *tpl;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1498 Array *decldefs;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1499 Expression *constraint = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1500 Loc loc = this->loc;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1501
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1502 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1503 if (token.value != TOKidentifier)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1504 { error("TemplateIdentifier expected following template");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1505 goto Lerr;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1506 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1507 id = token.ident;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1508 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1509 tpl = parseTemplateParameterList();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1510 if (!tpl)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1511 goto Lerr;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1512
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1513 constraint = parseConstraint();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1514
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1515 if (token.value != TOKlcurly)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1516 { error("members of template declaration expected");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1517 goto Lerr;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1518 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1519 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1520 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1521 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1522 decldefs = parseDeclDefs(0);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1523 if (token.value != TOKrcurly)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1524 { error("template member expected");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1525 goto Lerr;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1526 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1527 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1528 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1529
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1530 tempdecl = new TemplateDeclaration(loc, id, tpl, constraint, decldefs);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1531 return tempdecl;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1532
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1533 Lerr:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1534 return NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1535 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1536
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1537 /******************************************
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1538 * Parse template parameter list.
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1539 * Input:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1540 * flag 0: parsing "( list )"
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1541 * 1: parsing non-empty "list )"
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1542 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1543
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1544 TemplateParameters *Parser::parseTemplateParameterList(int flag)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1545 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1546 TemplateParameters *tpl = new TemplateParameters();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1547
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1548 if (!flag && token.value != TOKlparen)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1549 { error("parenthesized TemplateParameterList expected following TemplateIdentifier");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1550 goto Lerr;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1551 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1552 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1553
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1554 // Get array of TemplateParameters
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1555 if (flag \|\| token.value != TOKrparen)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1556 { int isvariadic = 0;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1557
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1558 while (1)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1559 { TemplateParameter *tp;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1560 Identifier *tp_ident = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1561 Type *tp_spectype = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1562 Type *tp_valtype = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1563 Type *tp_defaulttype = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1564 Expression *tp_specvalue = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1565 Expression *tp_defaultvalue = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1566 Token *t;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1567
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1568 // Get TemplateParameter
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1569
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1570 // First, look ahead to see if it is a TypeParameter or a ValueParameter
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1571 t = peek(&token);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1572 if (token.value == TOKalias)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1573 { // AliasParameter
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1574 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1575 Type *spectype = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1576 if (isDeclaration(&token, 2, TOKreserved, NULL))
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1577 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1578 spectype = parseType(&tp_ident);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1579 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1580 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1581 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1582 if (token.value != TOKidentifier)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1583 { error("identifier expected for template alias parameter");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1584 goto Lerr;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1585 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1586 tp_ident = token.ident;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1587 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1588 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1589 Object *spec = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1590 if (token.value == TOKcolon) // : Type
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1591 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1592 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1593 if (isDeclaration(&token, 0, TOKreserved, NULL))
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1594 spec = parseType();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1595 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1596 spec = parseCondExp();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1597 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1598 Object *def = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1599 if (token.value == TOKassign) // = Type
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1600 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1601 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1602 if (isDeclaration(&token, 0, TOKreserved, NULL))
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1603 def = parseType();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1604 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1605 def = parseCondExp();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1606 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1607 tp = new TemplateAliasParameter(loc, tp_ident, spectype, spec, def);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1608 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1609 else if (t->value == TOKcolon \|\| t->value == TOKassign \|\|
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1610 t->value == TOKcomma \|\| t->value == TOKrparen)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1611 { // TypeParameter
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1612 if (token.value != TOKidentifier)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1613 { error("identifier expected for template type parameter");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1614 goto Lerr;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1615 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1616 tp_ident = token.ident;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1617 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1618 if (token.value == TOKcolon) // : Type
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1619 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1620 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1621 tp_spectype = parseType();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1622 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1623 if (token.value == TOKassign) // = Type
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1624 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1625 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1626 tp_defaulttype = parseType();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1627 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1628 tp = new TemplateTypeParameter(loc, tp_ident, tp_spectype, tp_defaulttype);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1629 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1630 else if (token.value == TOKidentifier && t->value == TOKdotdotdot)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1631 { // ident...
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1632 if (isvariadic)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1633 error("variadic template parameter must be last");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1634 isvariadic = 1;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1635 tp_ident = token.ident;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1636 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1637 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1638 tp = new TemplateTupleParameter(loc, tp_ident);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1639 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1640 #if DMDV2
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1641 else if (token.value == TOKthis)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1642 { // ThisParameter
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1643 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1644 if (token.value != TOKidentifier)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1645 { error("identifier expected for template this parameter");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1646 goto Lerr;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1647 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1648 tp_ident = token.ident;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1649 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1650 if (token.value == TOKcolon) // : Type
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1651 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1652 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1653 tp_spectype = parseType();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1654 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1655 if (token.value == TOKassign) // = Type
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1656 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1657 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1658 tp_defaulttype = parseType();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1659 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1660 tp = new TemplateThisParameter(loc, tp_ident, tp_spectype, tp_defaulttype);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1661 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1662 #endif
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1663 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1664 { // ValueParameter
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1665 tp_valtype = parseType(&tp_ident);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1666 if (!tp_ident)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1667 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1668 error("identifier expected for template value parameter");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1669 tp_ident = new Identifier("error", TOKidentifier);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1670 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1671 if (token.value == TOKcolon) // : CondExpression
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1672 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1673 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1674 tp_specvalue = parseCondExp();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1675 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1676 if (token.value == TOKassign) // = CondExpression
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1677 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1678 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1679 tp_defaultvalue = parseDefaultInitExp();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1680 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1681 tp = new TemplateValueParameter(loc, tp_ident, tp_valtype, tp_specvalue, tp_defaultvalue);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1682 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1683 tpl->push(tp);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1684 if (token.value != TOKcomma)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1685 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1686 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1687 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1688 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1689 check(TOKrparen);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1690 Lerr:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1691 return tpl;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1692 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1693
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1694 /******************************************
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1695 * Parse template mixin.
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1696 * mixin Foo;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1697 * mixin Foo!(args);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1698 * mixin a.b.c!(args).Foo!(args);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1699 * mixin Foo!(args) identifier;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1700 * mixin typeof(expr).identifier!(args);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1701 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1702
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1703 Dsymbol *Parser::parseMixin()
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1704 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1705 TemplateMixin *tm;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1706 Identifier *id;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1707 Type *tqual;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1708 Objects *tiargs;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1709 Array *idents;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1710
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1711 //printf("parseMixin()\n");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1712 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1713 tqual = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1714 if (token.value == TOKdot)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1715 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1716 id = Id::empty;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1717 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1718 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1719 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1720 if (token.value == TOKtypeof)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1721 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1722 tqual = parseTypeof();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1723 check(TOKdot);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1724 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1725 if (token.value != TOKidentifier)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1726 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1727 error("identifier expected, not %s", token.toChars());
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1728 id = Id::empty;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1729 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1730 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1731 id = token.ident;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1732 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1733 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1734
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1735 idents = new Array();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1736 while (1)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1737 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1738 tiargs = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1739 if (token.value == TOKnot)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1740 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1741 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1742 if (token.value == TOKlparen)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1743 tiargs = parseTemplateArgumentList();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1744 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1745 tiargs = parseTemplateArgument();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1746 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1747
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1748 if (token.value != TOKdot)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1749 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1750
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1751 if (tiargs)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1752 { TemplateInstance *tempinst = new TemplateInstance(loc, id);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1753 tempinst->tiargs = tiargs;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1754 id = (Identifier *)tempinst;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1755 tiargs = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1756 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1757 idents->push(id);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1758
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1759 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1760 if (token.value != TOKidentifier)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1761 { error("identifier expected following '.' instead of '%s'", token.toChars());
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1762 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1763 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1764 id = token.ident;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1765 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1766 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1767 idents->push(id);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1768
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1769 if (token.value == TOKidentifier)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1770 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1771 id = token.ident;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1772 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1773 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1774 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1775 id = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1776
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1777 tm = new TemplateMixin(loc, id, tqual, idents, tiargs);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1778 if (token.value != TOKsemicolon)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1779 error("';' expected after mixin");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1780 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1781
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1782 return tm;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1783 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1784
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1785 /******************************************
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1786 * Parse template argument list.
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1787 * Input:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1788 * current token is opening '('
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1789 * Output:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1790 * current token is one after closing ')'
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1791 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1792
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1793 Objects *Parser::parseTemplateArgumentList()
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1794 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1795 //printf("Parser::parseTemplateArgumentList()\n");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1796 if (token.value != TOKlparen && token.value != TOKlcurly)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1797 { error("!(TemplateArgumentList) expected following TemplateIdentifier");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1798 return new Objects();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1799 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1800 return parseTemplateArgumentList2();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1801 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1802
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1803 Objects *Parser::parseTemplateArgumentList2()
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1804 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1805 //printf("Parser::parseTemplateArgumentList2()\n");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1806 Objects *tiargs = new Objects();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1807 enum TOK endtok = TOKrparen;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1808 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1809
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1810 // Get TemplateArgumentList
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1811 if (token.value != endtok)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1812 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1813 while (1)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1814 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1815 // See if it is an Expression or a Type
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1816 if (isDeclaration(&token, 0, TOKreserved, NULL))
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1817 { // Template argument is a type
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1818 Type *ta = parseType();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1819 tiargs->push(ta);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1820 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1821 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1822 { // Template argument is an expression
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1823 Expression *ea = parseAssignExp();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1824
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1825 if (ea->op == TOKfunction)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1826 { FuncLiteralDeclaration fd = ((FuncExp )ea)->fd;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1827 if (fd->type->ty == Tfunction)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1828 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1829 TypeFunction tf = (TypeFunction )fd->type;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1830 /* If there are parameters that consist of only an identifier,
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1831 * rather than assuming the identifier is a type, as we would
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1832 * for regular function declarations, assume the identifier
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1833 * is the parameter name, and we're building a template with
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1834 * a deduced type.
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1835 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1836 TemplateParameters *tpl = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1837 for (int i = 0; i < tf->parameters->dim; i++)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1838 { Argument param = (Argument )tf->parameters->data[i];
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1839 if (param->ident == NULL &&
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1840 param->type &&
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1841 param->type->ty == Tident &&
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1842 ((TypeIdentifier *)param->type)->idents.dim == 0
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1843 )
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1844 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1845 /* Switch parameter type to parameter identifier,
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1846 * parameterize with template type parameter _T
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1847 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1848 TypeIdentifier pt = (TypeIdentifier )param->type;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1849 param->ident = pt->ident;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1850 Identifier *id = Lexer::uniqueId("__T");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1851 param->type = new TypeIdentifier(pt->loc, id);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1852 TemplateParameter *tp = new TemplateTypeParameter(fd->loc, id, NULL, NULL);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1853 if (!tpl)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1854 tpl = new TemplateParameters();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1855 tpl->push(tp);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1856 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1857 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1858
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1859 if (tpl)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1860 { // Wrap a template around function fd
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1861 Array *decldefs = new Array();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1862 decldefs->push(fd);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1863 TemplateDeclaration *tempdecl =
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1864 new TemplateDeclaration(fd->loc, fd->ident, tpl, NULL, decldefs);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1865 tempdecl->literal = 1; // it's a template 'literal'
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1866 tiargs->push(tempdecl);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1867 goto L1;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1868 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1869 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1870 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1871
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1872 tiargs->push(ea);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1873 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1874 L1:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1875 if (token.value != TOKcomma)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1876 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1877 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1878 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1879 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1880 check(endtok, "template argument list");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1881 return tiargs;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1882 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1883
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1884 /*****************************
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1885 * Parse single template argument, to support the syntax:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1886 * foo!arg
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1887 * Input:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1888 * current token is the arg
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1889 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1890
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1891 Objects *Parser::parseTemplateArgument()
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1892 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1893 //printf("parseTemplateArgument()\n");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1894 Objects *tiargs = new Objects();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1895 Type *ta;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1896 switch (token.value)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1897 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1898 case TOKidentifier:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1899 ta = new TypeIdentifier(loc, token.ident);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1900 goto LabelX;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1901
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1902 CASE_BASIC_TYPES_X(ta):
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1903 tiargs->push(ta);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1904 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1905 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1906
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1907 case TOKint32v:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1908 case TOKuns32v:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1909 case TOKint64v:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1910 case TOKuns64v:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1911 case TOKfloat32v:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1912 case TOKfloat64v:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1913 case TOKfloat80v:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1914 case TOKimaginary32v:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1915 case TOKimaginary64v:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1916 case TOKimaginary80v:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1917 case TOKnull:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1918 case TOKtrue:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1919 case TOKfalse:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1920 case TOKcharv:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1921 case TOKwcharv:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1922 case TOKdcharv:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1923 case TOKstring:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1924 case TOKfile:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1925 case TOKline:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1926 { // Template argument is an expression
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1927 Expression *ea = parsePrimaryExp();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1928 tiargs->push(ea);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1929 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1930 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1931
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1932 default:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1933 error("template argument expected following !");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1934 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1935 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1936 if (token.value == TOKnot)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1937 error("multiple ! arguments are not allowed");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1938 return tiargs;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1939 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1940
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1941 Import Parser::parseImport(Array decldefs, int isstatic)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1942 { Import *s;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1943 Identifier *id;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1944 Identifier *aliasid = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1945 Array *a;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1946 Loc loc;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1947
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1948 //printf("Parser::parseImport()\n");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1949 do
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1950 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1951 L1:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1952 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1953 if (token.value != TOKidentifier)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1954 { error("Identifier expected following import");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1955 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1956 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1957
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1958 loc = this->loc;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1959 a = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1960 id = token.ident;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1961 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1962 if (!aliasid && token.value == TOKassign)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1963 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1964 aliasid = id;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1965 goto L1;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1966 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1967 while (token.value == TOKdot)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1968 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1969 if (!a)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1970 a = new Array();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1971 a->push(id);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1972 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1973 if (token.value != TOKidentifier)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1974 { error("identifier expected following package");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1975 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1976 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1977 id = token.ident;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1978 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1979 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1980
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1981 s = new Import(loc, a, id, aliasid, isstatic);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1982 decldefs->push(s);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1983
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1984 /* Look for
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1985 * : alias=name, alias=name;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1986 * syntax.
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1987 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1988 if (token.value == TOKcolon)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1989 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1990 do
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1991 { Identifier *name;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1992
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1993 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1994 if (token.value != TOKidentifier)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1995 { error("Identifier expected following :");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1996 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1997 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1998 Identifier *alias = token.ident;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	1999 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2000 if (token.value == TOKassign)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2001 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2002 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2003 if (token.value != TOKidentifier)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2004 { error("Identifier expected following %s=", alias->toChars());
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2005 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2006 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2007 name = token.ident;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2008 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2009 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2010 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2011 { name = alias;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2012 alias = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2013 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2014 s->addAlias(name, alias);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2015 } while (token.value == TOKcomma);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2016 break; // no comma-separated imports of this form
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2017 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2018
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2019 aliasid = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2020 } while (token.value == TOKcomma);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2021
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2022 if (token.value == TOKsemicolon)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2023 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2024 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2025 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2026 error("';' expected");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2027 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2028 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2029
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2030 return NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2031 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2032
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2033 #if DMDV2
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2034 Type Parser::parseType(Identifier pident, TemplateParameters *tpl)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2035 { Type *t;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2036
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2037 /* Take care of the storage class prefixes that
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2038 * serve as type attributes:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2039 * const shared, shared const, const, invariant, shared
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2040 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2041 if (token.value == TOKconst && peekNext() == TOKshared && peekNext2() != TOKlparen \|\|
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2042 token.value == TOKshared && peekNext() == TOKconst && peekNext2() != TOKlparen)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2043 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2044 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2045 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2046 /* shared const type
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2047 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2048 t = parseType(pident, tpl);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2049 t = t->makeSharedConst();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2050 return t;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2051 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2052 else if (token.value == TOKconst && peekNext() != TOKlparen)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2053 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2054 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2055 /* const type
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2056 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2057 t = parseType(pident, tpl);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2058 t = t->makeConst();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2059 return t;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2060 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2061 else if ((token.value == TOKinvariant \|\| token.value == TOKimmutable) &&
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2062 peekNext() != TOKlparen)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2063 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2064 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2065 /* invariant type
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2066 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2067 t = parseType(pident, tpl);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2068 t = t->makeInvariant();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2069 return t;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2070 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2071 else if (token.value == TOKshared && peekNext() != TOKlparen)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2072 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2073 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2074 /* shared type
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2075 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2076 t = parseType(pident, tpl);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2077 t = t->makeShared();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2078 return t;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2079 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2080 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2081 t = parseBasicType();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2082 t = parseDeclarator(t, pident, tpl);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2083 return t;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2084 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2085 #endif
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2086
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2087 Type *Parser::parseBasicType()
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2088 { Type *t;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2089 Identifier *id;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2090 TypeQualified *tid;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2091
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2092 //printf("parseBasicType()\n");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2093 switch (token.value)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2094 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2095 CASE_BASIC_TYPES_X(t):
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2096 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2097 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2098
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2099 case TOKidentifier:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2100 id = token.ident;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2101 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2102 if (token.value == TOKnot)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2103 { // ident!(template_arguments)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2104 TemplateInstance *tempinst = new TemplateInstance(loc, id);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2105 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2106 if (token.value == TOKlparen)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2107 // ident!(template_arguments)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2108 tempinst->tiargs = parseTemplateArgumentList();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2109 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2110 // ident!template_argument
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2111 tempinst->tiargs = parseTemplateArgument();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2112 tid = new TypeInstance(loc, tempinst);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2113 goto Lident2;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2114 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2115 Lident:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2116 tid = new TypeIdentifier(loc, id);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2117 Lident2:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2118 while (token.value == TOKdot)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2119 { nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2120 if (token.value != TOKidentifier)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2121 { error("identifier expected following '.' instead of '%s'", token.toChars());
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2122 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2123 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2124 id = token.ident;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2125 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2126 if (token.value == TOKnot)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2127 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2128 TemplateInstance *tempinst = new TemplateInstance(loc, id);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2129 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2130 if (token.value == TOKlparen)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2131 // ident!(template_arguments)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2132 tempinst->tiargs = parseTemplateArgumentList();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2133 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2134 // ident!template_argument
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2135 tempinst->tiargs = parseTemplateArgument();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2136 tid->addIdent((Identifier *)tempinst);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2137 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2138 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2139 tid->addIdent(id);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2140 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2141 t = tid;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2142 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2143
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2144 case TOKdot:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2145 // Leading . as in .foo
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2146 id = Id::empty;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2147 goto Lident;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2148
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2149 case TOKtypeof:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2150 // typeof(expression)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2151 tid = parseTypeof();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2152 goto Lident2;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2153
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2154 case TOKconst:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2155 // const(type)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2156 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2157 check(TOKlparen);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2158 t = parseType();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2159 check(TOKrparen);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2160 if (t->isShared())
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2161 t = t->makeSharedConst();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2162 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2163 t = t->makeConst();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2164 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2165
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2166 case TOKinvariant:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2167 case TOKimmutable:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2168 // invariant(type)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2169 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2170 check(TOKlparen);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2171 t = parseType();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2172 check(TOKrparen);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2173 t = t->makeInvariant();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2174 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2175
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2176 case TOKshared:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2177 // shared(type)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2178 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2179 check(TOKlparen);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2180 t = parseType();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2181 check(TOKrparen);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2182 if (t->isConst())
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2183 t = t->makeSharedConst();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2184 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2185 t = t->makeShared();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2186 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2187
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2188 default:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2189 error("basic type expected, not %s", token.toChars());
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2190 t = Type::tint32;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2191 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2192 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2193 return t;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2194 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2195
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2196 /******************************************
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2197 * Parse things that follow the initial type t.
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2198 * t *
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2199 * t []
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2200 * t [type]
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2201 * t [expression]
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2202 * t [expression .. expression]
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2203 * t function
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2204 * t delegate
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2205 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2206
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2207 Type Parser::parseBasicType2(Type t)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2208 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2209 //printf("parseBasicType2()\n");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2210 while (1)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2211 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2212 switch (token.value)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2213 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2214 case TOKmul:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2215 t = new TypePointer(t);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2216 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2217 continue;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2218
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2219 case TOKlbracket:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2220 // Handle []. Make sure things like
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2221 // int[3][1] a;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2222 // is (array[1] of array[3] of int)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2223 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2224 if (token.value == TOKrbracket)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2225 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2226 t = new TypeDArray(t); // []
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2227 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2228 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2229 else if (isDeclaration(&token, 0, TOKrbracket, NULL))
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2230 { // It's an associative array declaration
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2231
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2232 //printf("it's an associative array\n");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2233 Type *index = parseType(); // [ type ]
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2234 t = new TypeAArray(t, index);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2235 check(TOKrbracket);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2236 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2237 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2238 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2239 //printf("it's type[expression]\n");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2240 inBrackets++;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2241 Expression *e = parseExpression(); // [ expression ]
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2242 if (token.value == TOKslice)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2243 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2244 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2245 Expression *e2 = parseExpression(); // [ exp .. exp ]
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2246 t = new TypeSlice(t, e, e2);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2247 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2248 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2249 t = new TypeSArray(t,e);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2250 inBrackets--;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2251 check(TOKrbracket);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2252 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2253 continue;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2254
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2255 case TOKdelegate:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2256 case TOKfunction:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2257 { // Handle delegate declaration:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2258 // t delegate(parameter list) nothrow pure
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2259 // t function(parameter list) nothrow pure
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2260 Arguments *arguments;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2261 int varargs;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2262 bool ispure = false;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2263 bool isnothrow = false;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2264 enum TOK save = token.value;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2265
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2266 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2267 arguments = parseParameters(&varargs);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2268 while (1)
1577 e4f7b5d9c68a DMD 2.032 Merge. Robert Clipsham <robert@octarineparrot.com> parents: 1526 diff changeset	2269 { // Postfixes
1452 638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2270 if (token.value == TOKpure)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2271 ispure = true;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2272 else if (token.value == TOKnothrow)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2273 isnothrow = true;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2274 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2275 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2276 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2277 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2278 TypeFunction *tf = new TypeFunction(arguments, t, varargs, linkage);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2279 tf->ispure = ispure;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2280 tf->isnothrow = isnothrow;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2281 if (save == TOKdelegate)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2282 t = new TypeDelegate(tf);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2283 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2284 t = new TypePointer(tf); // pointer to function
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2285 continue;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2286 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2287
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2288 default:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2289 return t;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2290 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2291 assert(0);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2292 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2293 assert(0);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2294 return NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2295 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2296
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2297 Type Parser::parseDeclarator(Type t, Identifier pident, TemplateParameters tpl)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2298 { Type *ts;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2299
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2300 //printf("parseDeclarator(tpl = %p)\n", tpl);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2301 t = parseBasicType2(t);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2302
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2303 switch (token.value)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2304 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2305
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2306 case TOKidentifier:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2307 if (pident)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2308 *pident = token.ident;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2309 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2310 error("unexpected identifer '%s' in declarator", token.ident->toChars());
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2311 ts = t;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2312 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2313 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2314
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2315 case TOKlparen:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2316 /* Parse things with parentheses around the identifier, like:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2317 * int (*ident[3])[]
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2318 * although the D style would be:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2319 * int[]*[3] ident
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2320 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2321 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2322 ts = parseDeclarator(t, pident);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2323 check(TOKrparen);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2324 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2325
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2326 default:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2327 ts = t;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2328 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2329 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2330
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2331 // parse DeclaratorSuffixes
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2332 while (1)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2333 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2334 switch (token.value)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2335 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2336 #if CARRAYDECL
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2337 /* Support C style array syntax:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2338 * int ident[]
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2339 * as opposed to D-style:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2340 * int[] ident
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2341 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2342 case TOKlbracket:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2343 { // This is the old C-style post [] syntax.
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2344 TypeNext *ta;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2345 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2346 if (token.value == TOKrbracket)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2347 { // It's a dynamic array
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2348 ta = new TypeDArray(t); // []
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2349 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2350 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2351 else if (isDeclaration(&token, 0, TOKrbracket, NULL))
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2352 { // It's an associative array
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2353
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2354 //printf("it's an associative array\n");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2355 Type *index = parseType(); // [ type ]
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2356 check(TOKrbracket);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2357 ta = new TypeAArray(t, index);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2358 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2359 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2360 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2361 //printf("It's a static array\n");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2362 Expression *e = parseExpression(); // [ expression ]
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2363 ta = new TypeSArray(t, e);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2364 check(TOKrbracket);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2365 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2366
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2367 /* Insert ta into
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2368 * ts -> ... -> t
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2369 * so that
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2370 * ts -> ... -> ta -> t
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2371 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2372 Type **pt;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2373 for (pt = &ts; pt != t; pt = &((TypeNext)*pt)->next)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2374 ;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2375 *pt = ta;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2376 continue;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2377 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2378 #endif
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2379 case TOKlparen:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2380 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2381 if (tpl)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2382 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2383 /* Look ahead to see if this is (...)(...),
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2384 * i.e. a function template declaration
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2385 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2386 if (peekPastParen(&token)->value == TOKlparen)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2387 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2388 //printf("function template declaration\n");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2389
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2390 // Gather template parameter list
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2391 *tpl = parseTemplateParameterList();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2392 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2393 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2394
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2395 int varargs;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2396 Arguments *arguments = parseParameters(&varargs);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2397 Type *tf = new TypeFunction(arguments, t, varargs, linkage);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2398
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2399 /* Parse const/invariant/nothrow/pure postfix
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2400 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2401 while (1)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2402 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2403 switch (token.value)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2404 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2405 case TOKconst:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2406 if (tf->isShared())
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2407 tf = tf->makeSharedConst();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2408 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2409 tf = tf->makeConst();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2410 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2411 continue;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2412
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2413 case TOKinvariant:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2414 case TOKimmutable:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2415 tf = tf->makeInvariant();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2416 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2417 continue;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2418
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2419 case TOKshared:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2420 if (tf->isConst())
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2421 tf = tf->makeSharedConst();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2422 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2423 tf = tf->makeShared();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2424 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2425 continue;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2426
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2427 case TOKnothrow:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2428 ((TypeFunction *)tf)->isnothrow = 1;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2429 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2430 continue;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2431
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2432 case TOKpure:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2433 ((TypeFunction *)tf)->ispure = 1;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2434 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2435 continue;
1577 e4f7b5d9c68a DMD 2.032 Merge. Robert Clipsham <robert@octarineparrot.com> parents: 1526 diff changeset	2436
e4f7b5d9c68a DMD 2.032 Merge. Robert Clipsham <robert@octarineparrot.com> parents: 1526 diff changeset	2437 case TOKat:
e4f7b5d9c68a DMD 2.032 Merge. Robert Clipsham <robert@octarineparrot.com> parents: 1526 diff changeset	2438 nextToken();
e4f7b5d9c68a DMD 2.032 Merge. Robert Clipsham <robert@octarineparrot.com> parents: 1526 diff changeset	2439 if (token.value != TOKidentifier)
e4f7b5d9c68a DMD 2.032 Merge. Robert Clipsham <robert@octarineparrot.com> parents: 1526 diff changeset	2440 { error("attribute identifier expected");
e4f7b5d9c68a DMD 2.032 Merge. Robert Clipsham <robert@octarineparrot.com> parents: 1526 diff changeset	2441 nextToken();
e4f7b5d9c68a DMD 2.032 Merge. Robert Clipsham <robert@octarineparrot.com> parents: 1526 diff changeset	2442 continue;
e4f7b5d9c68a DMD 2.032 Merge. Robert Clipsham <robert@octarineparrot.com> parents: 1526 diff changeset	2443 }
e4f7b5d9c68a DMD 2.032 Merge. Robert Clipsham <robert@octarineparrot.com> parents: 1526 diff changeset	2444 Identifier *id = token.ident;
e4f7b5d9c68a DMD 2.032 Merge. Robert Clipsham <robert@octarineparrot.com> parents: 1526 diff changeset	2445 if (id == Id::property)
e4f7b5d9c68a DMD 2.032 Merge. Robert Clipsham <robert@octarineparrot.com> parents: 1526 diff changeset	2446 ((TypeFunction *)tf)->ispure = 1;
e4f7b5d9c68a DMD 2.032 Merge. Robert Clipsham <robert@octarineparrot.com> parents: 1526 diff changeset	2447 else
e4f7b5d9c68a DMD 2.032 Merge. Robert Clipsham <robert@octarineparrot.com> parents: 1526 diff changeset	2448 error("valid attribute identifiers are property, not %s", id->toChars());
e4f7b5d9c68a DMD 2.032 Merge. Robert Clipsham <robert@octarineparrot.com> parents: 1526 diff changeset	2449 nextToken();
e4f7b5d9c68a DMD 2.032 Merge. Robert Clipsham <robert@octarineparrot.com> parents: 1526 diff changeset	2450 continue;
e4f7b5d9c68a DMD 2.032 Merge. Robert Clipsham <robert@octarineparrot.com> parents: 1526 diff changeset	2451
1452 638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2452 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2453 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2454 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2455
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2456 /* Insert tf into
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2457 * ts -> ... -> t
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2458 * so that
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2459 * ts -> ... -> tf -> t
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2460 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2461 Type **pt;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2462 for (pt = &ts; pt != t; pt = &((TypeNext)*pt)->next)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2463 ;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2464 *pt = tf;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2465 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2466 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2467 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2468 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2469 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2470
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2471 return ts;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2472 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2473
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2474 /**********************************
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2475 * Parse Declarations.
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2476 * These can be:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2477 * 1. declarations at global/class level
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2478 * 2. declarations at statement level
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2479 * Return array of Declaration *'s.
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2480 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2481
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2482 Array *Parser::parseDeclarations(unsigned storage_class)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2483 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2484 enum STC stc;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2485 Type *ts;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2486 Type *t;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2487 Type *tfirst;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2488 Identifier *ident;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2489 Array *a;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2490 enum TOK tok = TOKreserved;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2491 unsigned char *comment = token.blockComment;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2492 enum LINK link = linkage;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2493
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2494 //printf("parseDeclarations() %s\n", token.toChars());
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2495 if (storage_class)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2496 { ts = NULL; // infer type
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2497 goto L2;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2498 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2499
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2500 switch (token.value)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2501 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2502 case TOKalias:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2503 /* Look for:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2504 * alias identifier this;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2505 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2506 tok = token.value;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2507 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2508 if (token.value == TOKidentifier && peek(&token)->value == TOKthis)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2509 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2510 AliasThis *s = new AliasThis(this->loc, token.ident);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2511 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2512 check(TOKthis);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2513 check(TOKsemicolon);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2514 a = new Array();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2515 a->push(s);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2516 addComment(s, comment);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2517 return a;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2518 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2519 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2520 case TOKtypedef:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2521 tok = token.value;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2522 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2523 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2524 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2525
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2526 storage_class = STCundefined;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2527 while (1)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2528 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2529 switch (token.value)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2530 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2531 case TOKconst:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2532 if (peek(&token)->value == TOKlparen)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2533 break; // const as type constructor
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2534 stc = STCconst; // const as storage class
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2535 goto L1;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2536
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2537 case TOKinvariant:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2538 case TOKimmutable:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2539 if (peek(&token)->value == TOKlparen)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2540 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2541 stc = STCimmutable;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2542 goto L1;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2543
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2544 case TOKshared:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2545 if (peek(&token)->value == TOKlparen)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2546 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2547 stc = STCshared;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2548 goto L1;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2549
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2550 case TOKstatic: stc = STCstatic; goto L1;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2551 case TOKfinal: stc = STCfinal; goto L1;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2552 case TOKauto: stc = STCauto; goto L1;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2553 case TOKscope: stc = STCscope; goto L1;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2554 case TOKoverride: stc = STCoverride; goto L1;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2555 case TOKabstract: stc = STCabstract; goto L1;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2556 case TOKsynchronized: stc = STCsynchronized; goto L1;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2557 case TOKdeprecated: stc = STCdeprecated; goto L1;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2558 #if DMDV2
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2559 case TOKnothrow: stc = STCnothrow; goto L1;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2560 case TOKpure: stc = STCpure; goto L1;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2561 case TOKref: stc = STCref; goto L1;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2562 case TOKtls: stc = STCtls; goto L1;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2563 case TOKgshared: stc = STCgshared; goto L1;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2564 case TOKenum: stc = STCmanifest; goto L1;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2565 #endif
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2566 L1:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2567 if (storage_class & stc)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2568 error("redundant storage class '%s'", token.toChars());
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2569 storage_class = (STC) (storage_class \| stc);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2570 composeStorageClass(storage_class);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2571 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2572 continue;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2573
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2574 case TOKextern:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2575 if (peek(&token)->value != TOKlparen)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2576 { stc = STCextern;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2577 goto L1;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2578 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2579
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2580 link = parseLinkage();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2581 continue;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2582
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2583 default:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2584 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2585 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2586 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2587 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2588
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2589 /* Look for auto initializers:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2590 * storage_class identifier = initializer;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2591 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2592 if (storage_class &&
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2593 token.value == TOKidentifier &&
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2594 peek(&token)->value == TOKassign)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2595 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2596 return parseAutoDeclarations(storage_class, comment);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2597 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2598
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2599 if (token.value == TOKclass)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2600 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2601 AggregateDeclaration s = (AggregateDeclaration )parseAggregate();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2602 s->storage_class \|= storage_class;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2603 a = new Array();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2604 a->push(s);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2605 addComment(s, comment);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2606 return a;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2607 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2608
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2609 /* Look for return type inference for template functions.
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2610 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2611 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2612 Token *tk;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2613 if (storage_class &&
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2614 token.value == TOKidentifier &&
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2615 (tk = peek(&token))->value == TOKlparen &&
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2616 skipParens(tk, &tk) &&
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2617 peek(tk)->value == TOKlparen)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2618 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2619 ts = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2620 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2621 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2622 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2623 ts = parseBasicType();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2624 ts = parseBasicType2(ts);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2625 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2626 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2627
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2628 L2:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2629 tfirst = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2630 a = new Array();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2631
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2632 while (1)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2633 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2634 Loc loc = this->loc;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2635 TemplateParameters *tpl = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2636
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2637 ident = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2638 t = parseDeclarator(ts, &ident, &tpl);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2639 assert(t);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2640 if (!tfirst)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2641 tfirst = t;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2642 else if (t != tfirst)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2643 error("multiple declarations must have the same type, not %s and %s",
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2644 tfirst->toChars(), t->toChars());
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2645 if (!ident)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2646 error("no identifier for declarator %s", t->toChars());
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2647
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2648 if (tok == TOKtypedef \|\| tok == TOKalias)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2649 { Declaration *v;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2650 Initializer *init = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2651
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2652 if (token.value == TOKassign)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2653 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2654 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2655 init = parseInitializer();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2656 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2657 if (tok == TOKtypedef)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2658 v = new TypedefDeclaration(loc, ident, t, init);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2659 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2660 { if (init)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2661 error("alias cannot have initializer");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2662 v = new AliasDeclaration(loc, ident, t);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2663 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2664 v->storage_class = storage_class;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2665 if (link == linkage)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2666 a->push(v);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2667 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2668 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2669 Array *ax = new Array();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2670 ax->push(v);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2671 Dsymbol *s = new LinkDeclaration(link, ax);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2672 a->push(s);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2673 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2674 switch (token.value)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2675 { case TOKsemicolon:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2676 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2677 addComment(v, comment);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2678 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2679
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2680 case TOKcomma:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2681 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2682 addComment(v, comment);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2683 continue;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2684
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2685 default:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2686 error("semicolon expected to close %s declaration", Token::toChars(tok));
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2687 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2688 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2689 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2690 else if (t->ty == Tfunction)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2691 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2692 TypeFunction tf = (TypeFunction )t;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2693 Expression *constraint = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2694 #if 0
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2695 if (Argument::isTPL(tf->parameters))
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2696 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2697 if (!tpl)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2698 tpl = new TemplateParameters();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2699 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2700 #endif
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2701 FuncDeclaration *f =
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2702 new FuncDeclaration(loc, 0, ident, (enum STC)storage_class, t);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2703 addComment(f, comment);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2704 if (tpl)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2705 constraint = parseConstraint();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2706 parseContracts(f);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2707 addComment(f, NULL);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2708 Dsymbol *s;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2709 if (link == linkage)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2710 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2711 s = f;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2712 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2713 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2714 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2715 Array *ax = new Array();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2716 ax->push(f);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2717 s = new LinkDeclaration(link, ax);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2718 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2719 /* A template parameter list means it's a function template
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2720 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2721 if (tpl)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2722 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2723 // Wrap a template around the function declaration
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2724 Array *decldefs = new Array();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2725 decldefs->push(s);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2726 TemplateDeclaration *tempdecl =
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2727 new TemplateDeclaration(loc, s->ident, tpl, constraint, decldefs);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2728 s = tempdecl;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2729 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2730 addComment(s, comment);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2731 a->push(s);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2732 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2733 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2734 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2735 Initializer *init = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2736 if (token.value == TOKassign)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2737 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2738 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2739 init = parseInitializer();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2740 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2741
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2742 VarDeclaration *v = new VarDeclaration(loc, t, ident, init);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2743 v->storage_class = storage_class;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2744 if (link == linkage)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2745 a->push(v);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2746 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2747 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2748 Array *ax = new Array();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2749 ax->push(v);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2750 Dsymbol *s = new LinkDeclaration(link, ax);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2751 a->push(s);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2752 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2753 switch (token.value)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2754 { case TOKsemicolon:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2755 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2756 addComment(v, comment);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2757 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2758
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2759 case TOKcomma:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2760 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2761 addComment(v, comment);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2762 continue;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2763
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2764 default:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2765 error("semicolon expected, not '%s'", token.toChars());
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2766 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2767 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2768 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2769 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2770 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2771 return a;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2772 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2773
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2774 /*****************************************
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2775 * Parse auto declarations of the form:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2776 * storageClass ident = init, ident = init, ... ;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2777 * and return the array of them.
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2778 * Starts with token on the first ident.
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2779 * Ends with scanner past closing ';'
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2780 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2781
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2782 #if DMDV2
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2783 Array Parser::parseAutoDeclarations(unsigned storageClass, unsigned char comment)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2784 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2785 Array *a = new Array;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2786
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2787 while (1)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2788 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2789 Identifier *ident = token.ident;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2790 nextToken(); // skip over ident
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2791 assert(token.value == TOKassign);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2792 nextToken(); // skip over '='
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2793 Initializer *init = parseInitializer();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2794 VarDeclaration *v = new VarDeclaration(loc, NULL, ident, init);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2795 v->storage_class = storageClass;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2796 a->push(v);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2797 if (token.value == TOKsemicolon)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2798 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2799 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2800 addComment(v, comment);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2801 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2802 else if (token.value == TOKcomma)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2803 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2804 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2805 if (token.value == TOKidentifier &&
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2806 peek(&token)->value == TOKassign)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2807 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2808 addComment(v, comment);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2809 continue;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2810 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2811 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2812 error("Identifier expected following comma");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2813 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2814 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2815 error("semicolon expected following auto declaration, not '%s'", token.toChars());
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2816 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2817 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2818 return a;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2819 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2820 #endif
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2821
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2822 /*****************************************
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2823 * Parse contracts following function declaration.
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2824 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2825
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2826 void Parser::parseContracts(FuncDeclaration *f)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2827 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2828 Type *tb;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2829 enum LINK linksave = linkage;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2830
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2831 // The following is irrelevant, as it is overridden by sc->linkage in
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2832 // TypeFunction::semantic
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2833 linkage = LINKd; // nested functions have D linkage
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2834 L1:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2835 switch (token.value)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2836 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2837 case TOKlcurly:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2838 if (f->frequire \|\| f->fensure)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2839 error("missing body { ... } after in or out");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2840 f->fbody = parseStatement(PSsemi);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2841 f->endloc = endloc;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2842 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2843
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2844 case TOKbody:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2845 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2846 f->fbody = parseStatement(PScurly);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2847 f->endloc = endloc;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2848 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2849
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2850 case TOKsemicolon:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2851 if (f->frequire \|\| f->fensure)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2852 error("missing body { ... } after in or out");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2853 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2854 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2855
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2856 #if 0 // Do we want this for function declarations, so we can do:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2857 // int x, y, foo(), z;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2858 case TOKcomma:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2859 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2860 continue;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2861 #endif
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2862
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2863 #if 0 // Dumped feature
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2864 case TOKthrow:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2865 if (!f->fthrows)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2866 f->fthrows = new Array();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2867 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2868 check(TOKlparen);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2869 while (1)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2870 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2871 tb = parseBasicType();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2872 f->fthrows->push(tb);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2873 if (token.value == TOKcomma)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2874 { nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2875 continue;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2876 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2877 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2878 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2879 check(TOKrparen);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2880 goto L1;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2881 #endif
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2882
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2883 case TOKin:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2884 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2885 if (f->frequire)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2886 error("redundant 'in' statement");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2887 f->frequire = parseStatement(PScurly \| PSscope);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2888 goto L1;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2889
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2890 case TOKout:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2891 // parse: out (identifier) { statement }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2892 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2893 if (token.value != TOKlcurly)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2894 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2895 check(TOKlparen);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2896 if (token.value != TOKidentifier)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2897 error("(identifier) following 'out' expected, not %s", token.toChars());
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2898 f->outId = token.ident;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2899 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2900 check(TOKrparen);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2901 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2902 if (f->fensure)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2903 error("redundant 'out' statement");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2904 f->fensure = parseStatement(PScurly \| PSscope);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2905 goto L1;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2906
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2907 default:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2908 error("semicolon expected following function declaration");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2909 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2910 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2911 linkage = linksave;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2912 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2913
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2914 /*****************************************
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2915 * Parse initializer for variable declaration.
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2916 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2917
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2918 Initializer *Parser::parseInitializer()
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2919 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2920 StructInitializer *is;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2921 ArrayInitializer *ia;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2922 ExpInitializer *ie;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2923 Expression *e;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2924 Identifier *id;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2925 Initializer *value;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2926 int comma;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2927 Loc loc = this->loc;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2928 Token *t;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2929 int braces;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2930 int brackets;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2931
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2932 switch (token.value)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2933 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2934 case TOKlcurly:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2935 /* Scan ahead to see if it is a struct initializer or
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2936 * a function literal.
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2937 * If it contains a ';', it is a function literal.
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2938 * Treat { } as a struct initializer.
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2939 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2940 braces = 1;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2941 for (t = peek(&token); 1; t = peek(t))
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2942 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2943 switch (t->value)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2944 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2945 case TOKsemicolon:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2946 case TOKreturn:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2947 goto Lexpression;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2948
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2949 case TOKlcurly:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2950 braces++;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2951 continue;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2952
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2953 case TOKrcurly:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2954 if (--braces == 0)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2955 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2956 continue;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2957
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2958 case TOKeof:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2959 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2960
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2961 default:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2962 continue;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2963 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2964 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2965 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2966
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2967 is = new StructInitializer(loc);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2968 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2969 comma = 0;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2970 while (1)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2971 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2972 switch (token.value)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2973 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2974 case TOKidentifier:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2975 if (comma == 1)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2976 error("comma expected separating field initializers");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2977 t = peek(&token);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2978 if (t->value == TOKcolon)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2979 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2980 id = token.ident;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2981 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2982 nextToken(); // skip over ':'
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2983 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2984 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2985 { id = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2986 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2987 value = parseInitializer();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2988 is->addInit(id, value);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2989 comma = 1;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2990 continue;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2991
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2992 case TOKcomma:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2993 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2994 comma = 2;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2995 continue;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2996
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2997 case TOKrcurly: // allow trailing comma's
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2998 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	2999 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3000
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3001 case TOKeof:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3002 error("found EOF instead of initializer");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3003 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3004
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3005 default:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3006 value = parseInitializer();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3007 is->addInit(NULL, value);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3008 comma = 1;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3009 continue;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3010 //error("found '%s' instead of field initializer", token.toChars());
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3011 //break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3012 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3013 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3014 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3015 return is;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3016
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3017 case TOKlbracket:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3018 /* Scan ahead to see if it is an array initializer or
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3019 * an expression.
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3020 * If it ends with a ';' ',' or '}', it is an array initializer.
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3021 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3022 brackets = 1;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3023 for (t = peek(&token); 1; t = peek(t))
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3024 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3025 switch (t->value)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3026 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3027 case TOKlbracket:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3028 brackets++;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3029 continue;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3030
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3031 case TOKrbracket:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3032 if (--brackets == 0)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3033 { t = peek(t);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3034 if (t->value != TOKsemicolon &&
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3035 t->value != TOKcomma &&
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3036 t->value != TOKrcurly)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3037 goto Lexpression;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3038 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3039 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3040 continue;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3041
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3042 case TOKeof:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3043 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3044
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3045 default:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3046 continue;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3047 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3048 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3049 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3050
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3051 ia = new ArrayInitializer(loc);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3052 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3053 comma = 0;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3054 while (1)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3055 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3056 switch (token.value)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3057 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3058 default:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3059 if (comma == 1)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3060 { error("comma expected separating array initializers, not %s", token.toChars());
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3061 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3062 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3063 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3064 e = parseAssignExp();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3065 if (!e)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3066 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3067 if (token.value == TOKcolon)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3068 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3069 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3070 value = parseInitializer();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3071 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3072 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3073 { value = new ExpInitializer(e->loc, e);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3074 e = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3075 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3076 ia->addInit(e, value);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3077 comma = 1;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3078 continue;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3079
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3080 case TOKlcurly:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3081 case TOKlbracket:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3082 if (comma == 1)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3083 error("comma expected separating array initializers, not %s", token.toChars());
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3084 value = parseInitializer();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3085 ia->addInit(NULL, value);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3086 comma = 1;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3087 continue;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3088
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3089 case TOKcomma:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3090 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3091 comma = 2;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3092 continue;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3093
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3094 case TOKrbracket: // allow trailing comma's
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3095 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3096 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3097
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3098 case TOKeof:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3099 error("found '%s' instead of array initializer", token.toChars());
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3100 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3101 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3102 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3103 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3104 return ia;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3105
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3106 case TOKvoid:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3107 t = peek(&token);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3108 if (t->value == TOKsemicolon \|\| t->value == TOKcomma)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3109 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3110 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3111 return new VoidInitializer(loc);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3112 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3113 goto Lexpression;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3114
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3115 default:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3116 Lexpression:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3117 e = parseAssignExp();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3118 ie = new ExpInitializer(loc, e);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3119 return ie;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3120 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3121 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3122
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3123 /*****************************************
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3124 * Parses default argument initializer expression that is an assign expression,
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3125 * with special handling for __FILE__ and __LINE__.
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3126 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3127
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3128 #if DMDV2
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3129 Expression *Parser::parseDefaultInitExp()
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3130 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3131 if (token.value == TOKfile \|\|
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3132 token.value == TOKline)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3133 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3134 Token *t = peek(&token);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3135 if (t->value == TOKcomma \|\| t->value == TOKrparen)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3136 { Expression *e;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3137
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3138 if (token.value == TOKfile)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3139 e = new FileInitExp(loc);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3140 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3141 e = new LineInitExp(loc);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3142 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3143 return e;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3144 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3145 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3146
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3147 Expression *e = parseAssignExp();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3148 return e;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3149 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3150 #endif
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3151
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3152 /*****************************************
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3153 * Input:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3154 * flags PSxxxx
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3155 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3156
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3157 Statement *Parser::parseStatement(int flags)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3158 { Statement *s;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3159 Token *t;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3160 Condition *condition;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3161 Statement *ifbody;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3162 Statement *elsebody;
1526 54b3c1394d62 Merged dmdfe 2.031. Robert Clipsham <robert@octarineparrot.com> parents: 1452 diff changeset	3163 bool isfinal;
1452 638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3164 Loc loc = this->loc;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3165
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3166 //printf("parseStatement()\n");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3167
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3168 if (flags & PScurly && token.value != TOKlcurly)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3169 error("statement expected to be { }, not %s", token.toChars());
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3170
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3171 switch (token.value)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3172 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3173 case TOKidentifier:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3174 /* A leading identifier can be a declaration, label, or expression.
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3175 * The easiest case to check first is label:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3176 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3177 t = peek(&token);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3178 if (t->value == TOKcolon)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3179 { // It's a label
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3180
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3181 Identifier *ident = token.ident;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3182 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3183 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3184 s = parseStatement(PSsemi);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3185 s = new LabelStatement(loc, ident, s);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3186 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3187 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3188 // fallthrough to TOKdot
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3189 case TOKdot:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3190 case TOKtypeof:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3191 if (isDeclaration(&token, 2, TOKreserved, NULL))
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3192 goto Ldeclaration;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3193 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3194 goto Lexp;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3195 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3196
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3197 case TOKassert:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3198 case TOKthis:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3199 case TOKsuper:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3200 case TOKint32v:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3201 case TOKuns32v:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3202 case TOKint64v:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3203 case TOKuns64v:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3204 case TOKfloat32v:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3205 case TOKfloat64v:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3206 case TOKfloat80v:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3207 case TOKimaginary32v:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3208 case TOKimaginary64v:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3209 case TOKimaginary80v:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3210 case TOKcharv:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3211 case TOKwcharv:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3212 case TOKdcharv:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3213 case TOKnull:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3214 case TOKtrue:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3215 case TOKfalse:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3216 case TOKstring:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3217 case TOKlparen:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3218 case TOKcast:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3219 case TOKmul:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3220 case TOKmin:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3221 case TOKadd:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3222 case TOKplusplus:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3223 case TOKminusminus:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3224 case TOKnew:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3225 case TOKdelete:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3226 case TOKdelegate:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3227 case TOKfunction:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3228 case TOKtypeid:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3229 case TOKis:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3230 case TOKlbracket:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3231 #if DMDV2
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3232 case TOKtraits:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3233 case TOKfile:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3234 case TOKline:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3235 #endif
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3236 Lexp:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3237 { Expression *exp;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3238
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3239 exp = parseExpression();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3240 check(TOKsemicolon, "statement");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3241 s = new ExpStatement(loc, exp);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3242 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3243 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3244
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3245 case TOKstatic:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3246 { // Look ahead to see if it's static assert() or static if()
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3247 Token *t;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3248
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3249 t = peek(&token);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3250 if (t->value == TOKassert)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3251 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3252 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3253 s = new StaticAssertStatement(parseStaticAssert());
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3254 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3255 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3256 if (t->value == TOKif)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3257 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3258 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3259 condition = parseStaticIfCondition();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3260 goto Lcondition;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3261 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3262 goto Ldeclaration;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3263 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3264
1526 54b3c1394d62 Merged dmdfe 2.031. Robert Clipsham <robert@octarineparrot.com> parents: 1452 diff changeset	3265 case TOKfinal:
54b3c1394d62 Merged dmdfe 2.031. Robert Clipsham <robert@octarineparrot.com> parents: 1452 diff changeset	3266 if (peekNext() == TOKswitch)
54b3c1394d62 Merged dmdfe 2.031. Robert Clipsham <robert@octarineparrot.com> parents: 1452 diff changeset	3267 {
54b3c1394d62 Merged dmdfe 2.031. Robert Clipsham <robert@octarineparrot.com> parents: 1452 diff changeset	3268 nextToken();
54b3c1394d62 Merged dmdfe 2.031. Robert Clipsham <robert@octarineparrot.com> parents: 1452 diff changeset	3269 isfinal = TRUE;
54b3c1394d62 Merged dmdfe 2.031. Robert Clipsham <robert@octarineparrot.com> parents: 1452 diff changeset	3270 goto Lswitch;
54b3c1394d62 Merged dmdfe 2.031. Robert Clipsham <robert@octarineparrot.com> parents: 1452 diff changeset	3271 }
54b3c1394d62 Merged dmdfe 2.031. Robert Clipsham <robert@octarineparrot.com> parents: 1452 diff changeset	3272 goto Ldeclaration;
54b3c1394d62 Merged dmdfe 2.031. Robert Clipsham <robert@octarineparrot.com> parents: 1452 diff changeset	3273
1452 638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3274 CASE_BASIC_TYPES:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3275 case TOKtypedef:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3276 case TOKalias:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3277 case TOKconst:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3278 case TOKauto:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3279 case TOKextern:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3280 case TOKinvariant:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3281 #if DMDV2
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3282 case TOKimmutable:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3283 case TOKshared:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3284 case TOKnothrow:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3285 case TOKpure:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3286 case TOKtls:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3287 case TOKgshared:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3288 #endif
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3289 // case TOKtypeof:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3290 Ldeclaration:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3291 { Array *a;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3292
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3293 a = parseDeclarations(STCundefined);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3294 if (a->dim > 1)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3295 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3296 Statements *as = new Statements();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3297 as->reserve(a->dim);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3298 for (int i = 0; i < a->dim; i++)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3299 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3300 Dsymbol d = (Dsymbol )a->data[i];
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3301 s = new DeclarationStatement(loc, d);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3302 as->push(s);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3303 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3304 s = new CompoundDeclarationStatement(loc, as);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3305 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3306 else if (a->dim == 1)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3307 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3308 Dsymbol d = (Dsymbol )a->data[0];
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3309 s = new DeclarationStatement(loc, d);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3310 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3311 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3312 assert(0);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3313 if (flags & PSscope)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3314 s = new ScopeStatement(loc, s);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3315 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3316 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3317
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3318 case TOKstruct:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3319 case TOKunion:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3320 case TOKclass:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3321 case TOKinterface:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3322 { Dsymbol *d;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3323
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3324 d = parseAggregate();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3325 s = new DeclarationStatement(loc, d);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3326 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3327 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3328
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3329 case TOKenum:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3330 { /* Determine if this is a manifest constant declaration,
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3331 * or a conventional enum.
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3332 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3333 Dsymbol *d;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3334 Token *t = peek(&token);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3335 if (t->value == TOKlcurly \|\| t->value == TOKcolon)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3336 d = parseEnum();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3337 else if (t->value != TOKidentifier)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3338 goto Ldeclaration;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3339 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3340 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3341 t = peek(t);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3342 if (t->value == TOKlcurly \|\| t->value == TOKcolon \|\|
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3343 t->value == TOKsemicolon)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3344 d = parseEnum();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3345 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3346 goto Ldeclaration;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3347 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3348 s = new DeclarationStatement(loc, d);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3349 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3350 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3351
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3352 case TOKmixin:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3353 { t = peek(&token);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3354 if (t->value == TOKlparen)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3355 { // mixin(string)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3356 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3357 check(TOKlparen, "mixin");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3358 Expression *e = parseAssignExp();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3359 check(TOKrparen);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3360 check(TOKsemicolon);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3361 s = new CompileStatement(loc, e);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3362 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3363 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3364 Dsymbol *d = parseMixin();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3365 s = new DeclarationStatement(loc, d);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3366 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3367 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3368
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3369 case TOKlcurly:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3370 { Statements *statements;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3371
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3372 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3373 statements = new Statements();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3374 while (token.value != TOKrcurly)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3375 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3376 statements->push(parseStatement(PSsemi \| PScurlyscope));
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3377 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3378 endloc = this->loc;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3379 s = new CompoundStatement(loc, statements);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3380 if (flags & (PSscope \| PScurlyscope))
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3381 s = new ScopeStatement(loc, s);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3382 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3383 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3384 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3385
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3386 case TOKwhile:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3387 { Expression *condition;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3388 Statement *body;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3389
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3390 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3391 check(TOKlparen);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3392 condition = parseExpression();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3393 check(TOKrparen);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3394 body = parseStatement(PSscope);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3395 s = new WhileStatement(loc, condition, body);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3396 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3397 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3398
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3399 case TOKsemicolon:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3400 if (!(flags & PSsemi))
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3401 error("use '{ }' for an empty statement, not a ';'");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3402 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3403 s = new ExpStatement(loc, NULL);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3404 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3405
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3406 case TOKdo:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3407 { Statement *body;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3408 Expression *condition;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3409
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3410 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3411 body = parseStatement(PSscope);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3412 check(TOKwhile);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3413 check(TOKlparen);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3414 condition = parseExpression();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3415 check(TOKrparen);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3416 s = new DoStatement(loc, body, condition);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3417 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3418 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3419
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3420 case TOKfor:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3421 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3422 Statement *init;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3423 Expression *condition;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3424 Expression *increment;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3425 Statement *body;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3426
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3427 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3428 check(TOKlparen);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3429 if (token.value == TOKsemicolon)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3430 { init = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3431 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3432 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3433 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3434 { init = parseStatement(0);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3435 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3436 if (token.value == TOKsemicolon)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3437 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3438 condition = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3439 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3440 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3441 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3442 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3443 condition = parseExpression();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3444 check(TOKsemicolon, "for condition");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3445 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3446 if (token.value == TOKrparen)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3447 { increment = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3448 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3449 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3450 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3451 { increment = parseExpression();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3452 check(TOKrparen);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3453 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3454 body = parseStatement(PSscope);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3455 s = new ForStatement(loc, init, condition, increment, body);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3456 if (init)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3457 s = new ScopeStatement(loc, s);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3458 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3459 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3460
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3461 case TOKforeach:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3462 case TOKforeach_reverse:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3463 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3464 enum TOK op = token.value;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3465 Arguments *arguments;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3466
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3467 Statement *d;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3468 Statement *body;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3469 Expression *aggr;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3470
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3471 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3472 check(TOKlparen);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3473
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3474 arguments = new Arguments();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3475
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3476 while (1)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3477 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3478 Type *tb;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3479 Identifier *ai = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3480 Type *at;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3481 unsigned storageClass;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3482 Argument *a;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3483
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3484 storageClass = 0;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3485 if (token.value == TOKinout \|\| token.value == TOKref)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3486 { storageClass = STCref;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3487 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3488 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3489 if (token.value == TOKidentifier)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3490 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3491 Token *t = peek(&token);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3492 if (t->value == TOKcomma \|\| t->value == TOKsemicolon)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3493 { ai = token.ident;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3494 at = NULL; // infer argument type
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3495 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3496 goto Larg;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3497 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3498 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3499 at = parseType(&ai);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3500 if (!ai)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3501 error("no identifier for declarator %s", at->toChars());
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3502 Larg:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3503 a = new Argument(storageClass, at, ai, NULL);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3504 arguments->push(a);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3505 if (token.value == TOKcomma)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3506 { nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3507 continue;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3508 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3509 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3510 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3511 check(TOKsemicolon);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3512
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3513 aggr = parseExpression();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3514 if (token.value == TOKslice && arguments->dim == 1)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3515 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3516 Argument a = (Argument )arguments->data[0];
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3517 delete arguments;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3518 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3519 Expression *upr = parseExpression();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3520 check(TOKrparen);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3521 body = parseStatement(0);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3522 s = new ForeachRangeStatement(loc, op, a, aggr, upr, body);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3523 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3524 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3525 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3526 check(TOKrparen);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3527 body = parseStatement(0);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3528 s = new ForeachStatement(loc, op, arguments, aggr, body);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3529 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3530 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3531 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3532
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3533 case TOKif:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3534 { Argument *arg = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3535 Expression *condition;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3536 Statement *ifbody;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3537 Statement *elsebody;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3538
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3539 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3540 check(TOKlparen);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3541
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3542 if (token.value == TOKauto)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3543 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3544 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3545 if (token.value == TOKidentifier)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3546 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3547 Token *t = peek(&token);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3548 if (t->value == TOKassign)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3549 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3550 arg = new Argument(0, NULL, token.ident, NULL);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3551 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3552 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3553 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3554 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3555 { error("= expected following auto identifier");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3556 goto Lerror;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3557 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3558 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3559 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3560 { error("identifier expected following auto");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3561 goto Lerror;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3562 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3563 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3564 else if (isDeclaration(&token, 2, TOKassign, NULL))
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3565 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3566 Type *at;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3567 Identifier *ai;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3568
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3569 at = parseType(&ai);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3570 check(TOKassign);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3571 arg = new Argument(0, at, ai, NULL);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3572 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3573
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3574 // Check for " ident;"
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3575 else if (token.value == TOKidentifier)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3576 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3577 Token *t = peek(&token);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3578 if (t->value == TOKcomma \|\| t->value == TOKsemicolon)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3579 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3580 arg = new Argument(0, NULL, token.ident, NULL);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3581 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3582 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3583 if (1 \|\| !global.params.useDeprecated)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3584 error("if (v; e) is deprecated, use if (auto v = e)");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3585 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3586 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3587
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3588 condition = parseExpression();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3589 check(TOKrparen);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3590 ifbody = parseStatement(PSscope);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3591 if (token.value == TOKelse)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3592 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3593 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3594 elsebody = parseStatement(PSscope);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3595 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3596 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3597 elsebody = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3598 s = new IfStatement(loc, arg, condition, ifbody, elsebody);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3599 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3600 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3601
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3602 case TOKscope:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3603 if (peek(&token)->value != TOKlparen)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3604 goto Ldeclaration; // scope used as storage class
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3605 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3606 check(TOKlparen);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3607 if (token.value != TOKidentifier)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3608 { error("scope identifier expected");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3609 goto Lerror;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3610 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3611 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3612 { TOK t = TOKon_scope_exit;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3613 Identifier *id = token.ident;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3614
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3615 if (id == Id::exit)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3616 t = TOKon_scope_exit;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3617 else if (id == Id::failure)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3618 t = TOKon_scope_failure;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3619 else if (id == Id::success)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3620 t = TOKon_scope_success;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3621 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3622 error("valid scope identifiers are exit, failure, or success, not %s", id->toChars());
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3623 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3624 check(TOKrparen);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3625 Statement *st = parseStatement(PScurlyscope);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3626 s = new OnScopeStatement(loc, t, st);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3627 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3628 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3629
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3630 case TOKdebug:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3631 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3632 condition = parseDebugCondition();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3633 goto Lcondition;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3634
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3635 case TOKversion:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3636 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3637 condition = parseVersionCondition();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3638 goto Lcondition;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3639
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3640 Lcondition:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3641 ifbody = parseStatement(0 /PSsemi/);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3642 elsebody = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3643 if (token.value == TOKelse)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3644 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3645 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3646 elsebody = parseStatement(0 /PSsemi/);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3647 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3648 s = new ConditionalStatement(loc, condition, ifbody, elsebody);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3649 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3650
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3651 case TOKpragma:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3652 { Identifier *ident;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3653 Expressions *args = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3654 Statement *body;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3655
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3656 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3657 check(TOKlparen);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3658 if (token.value != TOKidentifier)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3659 { error("pragma(identifier expected");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3660 goto Lerror;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3661 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3662 ident = token.ident;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3663 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3664 if (token.value == TOKcomma && peekNext() != TOKrparen)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3665 args = parseArguments(); // pragma(identifier, args...);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3666 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3667 check(TOKrparen); // pragma(identifier);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3668 if (token.value == TOKsemicolon)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3669 { nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3670 body = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3671 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3672 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3673 body = parseStatement(PSsemi);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3674 s = new PragmaStatement(loc, ident, args, body);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3675 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3676 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3677
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3678 case TOKswitch:
1526 54b3c1394d62 Merged dmdfe 2.031. Robert Clipsham <robert@octarineparrot.com> parents: 1452 diff changeset	3679 isfinal = FALSE;
54b3c1394d62 Merged dmdfe 2.031. Robert Clipsham <robert@octarineparrot.com> parents: 1452 diff changeset	3680 goto Lswitch;
54b3c1394d62 Merged dmdfe 2.031. Robert Clipsham <robert@octarineparrot.com> parents: 1452 diff changeset	3681
54b3c1394d62 Merged dmdfe 2.031. Robert Clipsham <robert@octarineparrot.com> parents: 1452 diff changeset	3682 Lswitch:
54b3c1394d62 Merged dmdfe 2.031. Robert Clipsham <robert@octarineparrot.com> parents: 1452 diff changeset	3683 {
1452 638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3684 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3685 check(TOKlparen);
1526 54b3c1394d62 Merged dmdfe 2.031. Robert Clipsham <robert@octarineparrot.com> parents: 1452 diff changeset	3686 Expression *condition = parseExpression();
1452 638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3687 check(TOKrparen);
1526 54b3c1394d62 Merged dmdfe 2.031. Robert Clipsham <robert@octarineparrot.com> parents: 1452 diff changeset	3688 Statement *body = parseStatement(PSscope);
54b3c1394d62 Merged dmdfe 2.031. Robert Clipsham <robert@octarineparrot.com> parents: 1452 diff changeset	3689 s = new SwitchStatement(loc, condition, body, isfinal);
1452 638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3690 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3691 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3692
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3693 case TOKcase:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3694 { Expression *exp;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3695 Statements *statements;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3696 Array cases; // array of Expression's
1526 54b3c1394d62 Merged dmdfe 2.031. Robert Clipsham <robert@octarineparrot.com> parents: 1452 diff changeset	3697 Expression *last = NULL;
1452 638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3698
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3699 while (1)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3700 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3701 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3702 exp = parseAssignExp();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3703 cases.push(exp);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3704 if (token.value != TOKcomma)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3705 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3706 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3707 check(TOKcolon);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3708
1526 54b3c1394d62 Merged dmdfe 2.031. Robert Clipsham <robert@octarineparrot.com> parents: 1452 diff changeset	3709 #if DMDV2
54b3c1394d62 Merged dmdfe 2.031. Robert Clipsham <robert@octarineparrot.com> parents: 1452 diff changeset	3710 /* case exp: .. case last:
54b3c1394d62 Merged dmdfe 2.031. Robert Clipsham <robert@octarineparrot.com> parents: 1452 diff changeset	3711 */
54b3c1394d62 Merged dmdfe 2.031. Robert Clipsham <robert@octarineparrot.com> parents: 1452 diff changeset	3712 if (token.value == TOKslice)
54b3c1394d62 Merged dmdfe 2.031. Robert Clipsham <robert@octarineparrot.com> parents: 1452 diff changeset	3713 {
54b3c1394d62 Merged dmdfe 2.031. Robert Clipsham <robert@octarineparrot.com> parents: 1452 diff changeset	3714 if (cases.dim > 1)
54b3c1394d62 Merged dmdfe 2.031. Robert Clipsham <robert@octarineparrot.com> parents: 1452 diff changeset	3715 error("only one case allowed for start of case range");
54b3c1394d62 Merged dmdfe 2.031. Robert Clipsham <robert@octarineparrot.com> parents: 1452 diff changeset	3716 nextToken();
54b3c1394d62 Merged dmdfe 2.031. Robert Clipsham <robert@octarineparrot.com> parents: 1452 diff changeset	3717 check(TOKcase);
54b3c1394d62 Merged dmdfe 2.031. Robert Clipsham <robert@octarineparrot.com> parents: 1452 diff changeset	3718 last = parseAssignExp();
54b3c1394d62 Merged dmdfe 2.031. Robert Clipsham <robert@octarineparrot.com> parents: 1452 diff changeset	3719 check(TOKcolon);
54b3c1394d62 Merged dmdfe 2.031. Robert Clipsham <robert@octarineparrot.com> parents: 1452 diff changeset	3720 }
54b3c1394d62 Merged dmdfe 2.031. Robert Clipsham <robert@octarineparrot.com> parents: 1452 diff changeset	3721 #endif
54b3c1394d62 Merged dmdfe 2.031. Robert Clipsham <robert@octarineparrot.com> parents: 1452 diff changeset	3722
1452 638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3723 statements = new Statements();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3724 while (token.value != TOKcase &&
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3725 token.value != TOKdefault &&
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3726 token.value != TOKrcurly)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3727 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3728 statements->push(parseStatement(PSsemi \| PScurlyscope));
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3729 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3730 s = new CompoundStatement(loc, statements);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3731 s = new ScopeStatement(loc, s);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3732
1526 54b3c1394d62 Merged dmdfe 2.031. Robert Clipsham <robert@octarineparrot.com> parents: 1452 diff changeset	3733 #if DMDV2
54b3c1394d62 Merged dmdfe 2.031. Robert Clipsham <robert@octarineparrot.com> parents: 1452 diff changeset	3734 if (last)
1452 638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3735 {
1526 54b3c1394d62 Merged dmdfe 2.031. Robert Clipsham <robert@octarineparrot.com> parents: 1452 diff changeset	3736 s = new CaseRangeStatement(loc, exp, last, s);
54b3c1394d62 Merged dmdfe 2.031. Robert Clipsham <robert@octarineparrot.com> parents: 1452 diff changeset	3737 }
54b3c1394d62 Merged dmdfe 2.031. Robert Clipsham <robert@octarineparrot.com> parents: 1452 diff changeset	3738 else
54b3c1394d62 Merged dmdfe 2.031. Robert Clipsham <robert@octarineparrot.com> parents: 1452 diff changeset	3739 #endif
54b3c1394d62 Merged dmdfe 2.031. Robert Clipsham <robert@octarineparrot.com> parents: 1452 diff changeset	3740 {
54b3c1394d62 Merged dmdfe 2.031. Robert Clipsham <robert@octarineparrot.com> parents: 1452 diff changeset	3741 // Keep cases in order by building the case statements backwards
54b3c1394d62 Merged dmdfe 2.031. Robert Clipsham <robert@octarineparrot.com> parents: 1452 diff changeset	3742 for (int i = cases.dim; i; i--)
54b3c1394d62 Merged dmdfe 2.031. Robert Clipsham <robert@octarineparrot.com> parents: 1452 diff changeset	3743 {
54b3c1394d62 Merged dmdfe 2.031. Robert Clipsham <robert@octarineparrot.com> parents: 1452 diff changeset	3744 exp = (Expression *)cases.data[i - 1];
54b3c1394d62 Merged dmdfe 2.031. Robert Clipsham <robert@octarineparrot.com> parents: 1452 diff changeset	3745 s = new CaseStatement(loc, exp, s);
54b3c1394d62 Merged dmdfe 2.031. Robert Clipsham <robert@octarineparrot.com> parents: 1452 diff changeset	3746 }
1452 638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3747 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3748 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3749 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3750
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3751 case TOKdefault:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3752 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3753 Statements *statements;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3754
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3755 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3756 check(TOKcolon);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3757
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3758 statements = new Statements();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3759 while (token.value != TOKcase &&
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3760 token.value != TOKdefault &&
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3761 token.value != TOKrcurly)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3762 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3763 statements->push(parseStatement(PSsemi \| PScurlyscope));
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3764 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3765 s = new CompoundStatement(loc, statements);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3766 s = new ScopeStatement(loc, s);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3767 s = new DefaultStatement(loc, s);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3768 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3769 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3770
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3771 case TOKreturn:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3772 { Expression *exp;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3773
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3774 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3775 if (token.value == TOKsemicolon)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3776 exp = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3777 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3778 exp = parseExpression();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3779 check(TOKsemicolon, "return statement");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3780 s = new ReturnStatement(loc, exp);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3781 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3782 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3783
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3784 case TOKbreak:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3785 { Identifier *ident;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3786
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3787 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3788 if (token.value == TOKidentifier)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3789 { ident = token.ident;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3790 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3791 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3792 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3793 ident = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3794 check(TOKsemicolon, "break statement");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3795 s = new BreakStatement(loc, ident);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3796 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3797 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3798
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3799 case TOKcontinue:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3800 { Identifier *ident;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3801
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3802 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3803 if (token.value == TOKidentifier)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3804 { ident = token.ident;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3805 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3806 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3807 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3808 ident = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3809 check(TOKsemicolon, "continue statement");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3810 s = new ContinueStatement(loc, ident);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3811 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3812 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3813
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3814 case TOKgoto:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3815 { Identifier *ident;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3816
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3817 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3818 if (token.value == TOKdefault)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3819 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3820 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3821 s = new GotoDefaultStatement(loc);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3822 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3823 else if (token.value == TOKcase)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3824 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3825 Expression *exp = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3826
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3827 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3828 if (token.value != TOKsemicolon)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3829 exp = parseExpression();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3830 s = new GotoCaseStatement(loc, exp);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3831 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3832 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3833 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3834 if (token.value != TOKidentifier)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3835 { error("Identifier expected following goto");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3836 ident = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3837 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3838 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3839 { ident = token.ident;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3840 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3841 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3842 s = new GotoStatement(loc, ident);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3843 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3844 check(TOKsemicolon, "goto statement");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3845 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3846 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3847
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3848 case TOKsynchronized:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3849 { Expression *exp;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3850 Statement *body;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3851
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3852 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3853 if (token.value == TOKlparen)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3854 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3855 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3856 exp = parseExpression();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3857 check(TOKrparen);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3858 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3859 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3860 exp = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3861 body = parseStatement(PSscope);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3862 s = new SynchronizedStatement(loc, exp, body);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3863 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3864 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3865
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3866 case TOKwith:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3867 { Expression *exp;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3868 Statement *body;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3869
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3870 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3871 check(TOKlparen);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3872 exp = parseExpression();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3873 check(TOKrparen);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3874 body = parseStatement(PSscope);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3875 s = new WithStatement(loc, exp, body);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3876 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3877 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3878
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3879 case TOKtry:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3880 { Statement *body;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3881 Array *catches = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3882 Statement *finalbody = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3883
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3884 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3885 body = parseStatement(PSscope);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3886 while (token.value == TOKcatch)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3887 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3888 Statement *handler;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3889 Catch *c;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3890 Type *t;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3891 Identifier *id;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3892 Loc loc = this->loc;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3893
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3894 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3895 if (token.value == TOKlcurly)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3896 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3897 t = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3898 id = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3899 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3900 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3901 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3902 check(TOKlparen);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3903 id = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3904 t = parseType(&id);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3905 check(TOKrparen);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3906 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3907 handler = parseStatement(0);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3908 c = new Catch(loc, t, id, handler);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3909 if (!catches)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3910 catches = new Array();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3911 catches->push(c);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3912 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3913
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3914 if (token.value == TOKfinally)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3915 { nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3916 finalbody = parseStatement(0);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3917 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3918
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3919 s = body;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3920 if (!catches && !finalbody)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3921 error("catch or finally expected following try");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3922 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3923 { if (catches)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3924 s = new TryCatchStatement(loc, body, catches);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3925 if (finalbody)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3926 s = new TryFinallyStatement(loc, s, finalbody);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3927 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3928 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3929 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3930
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3931 case TOKthrow:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3932 { Expression *exp;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3933
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3934 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3935 exp = parseExpression();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3936 check(TOKsemicolon, "throw statement");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3937 s = new ThrowStatement(loc, exp);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3938 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3939 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3940
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3941 case TOKvolatile:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3942 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3943 s = parseStatement(PSsemi \| PScurlyscope);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3944 #if DMDV2
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3945 if (!global.params.useDeprecated)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3946 error("volatile statements deprecated; used synchronized statements instead");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3947 #endif
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3948 s = new VolatileStatement(loc, s);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3949 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3950
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3951 case TOKasm:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3952 { Statements *statements;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3953 Identifier *label;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3954 Loc labelloc;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3955 Token *toklist;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3956 Token **ptoklist;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3957
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3958 // Parse the asm block into a sequence of AsmStatements,
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3959 // each AsmStatement is one instruction.
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3960 // Separate out labels.
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3961 // Defer parsing of AsmStatements until semantic processing.
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3962
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3963 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3964 check(TOKlcurly);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3965 toklist = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3966 ptoklist = &toklist;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3967 label = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3968 statements = new Statements();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3969 while (1)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3970 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3971 switch (token.value)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3972 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3973 case TOKidentifier:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3974 if (!toklist)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3975 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3976 // Look ahead to see if it is a label
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3977 t = peek(&token);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3978 if (t->value == TOKcolon)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3979 { // It's a label
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3980 label = token.ident;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3981 labelloc = this->loc;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3982 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3983 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3984 continue;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3985 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3986 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3987 goto Ldefault;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3988
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3989 case TOKrcurly:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3990 if (toklist \|\| label)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3991 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3992 error("asm statements must end in ';'");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3993 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3994 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3995
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3996 case TOKsemicolon:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3997 s = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3998 if (toklist \|\| label)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	3999 { // Create AsmStatement from list of tokens we've saved
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4000 s = new AsmStatement(this->loc, toklist);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4001 toklist = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4002 ptoklist = &toklist;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4003 if (label)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4004 { s = new LabelStatement(labelloc, label, s);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4005 label = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4006 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4007 statements->push(s);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4008 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4009 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4010 continue;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4011
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4012 case TOKeof:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4013 /* { */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4014 error("matching '}' expected, not end of file");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4015 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4016
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4017 default:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4018 Ldefault:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4019 *ptoklist = new Token();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4020 memcpy(*ptoklist, &token, sizeof(Token));
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4021 ptoklist = &(*ptoklist)->next;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4022 *ptoklist = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4023
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4024 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4025 continue;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4026 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4027 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4028 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4029 s = new AsmBlockStatement(loc, statements);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4030 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4031 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4032 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4033
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4034 default:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4035 error("found '%s' instead of statement", token.toChars());
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4036 goto Lerror;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4037
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4038 Lerror:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4039 while (token.value != TOKrcurly &&
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4040 token.value != TOKsemicolon &&
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4041 token.value != TOKeof)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4042 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4043 if (token.value == TOKsemicolon)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4044 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4045 s = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4046 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4047 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4048
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4049 return s;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4050 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4051
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4052 void Parser::check(enum TOK value)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4053 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4054 check(loc, value);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4055 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4056
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4057 void Parser::check(Loc loc, enum TOK value)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4058 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4059 if (token.value != value)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4060 error(loc, "found '%s' when expecting '%s'", token.toChars(), Token::toChars(value));
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4061 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4062 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4063
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4064 void Parser::check(enum TOK value, const char *string)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4065 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4066 if (token.value != value)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4067 error("found '%s' when expecting '%s' following '%s'",
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4068 token.toChars(), Token::toChars(value), string);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4069 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4070 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4071
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4072 /************************************
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4073 * Determine if the scanner is sitting on the start of a declaration.
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4074 * Input:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4075 * needId 0 no identifier
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4076 * 1 identifier optional
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4077 * 2 must have identifier
1526 54b3c1394d62 Merged dmdfe 2.031. Robert Clipsham <robert@octarineparrot.com> parents: 1452 diff changeset	4078 * Output:
54b3c1394d62 Merged dmdfe 2.031. Robert Clipsham <robert@octarineparrot.com> parents: 1452 diff changeset	4079 * if *pt is not NULL, it is set to the ending token, which would be endtok
1452 638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4080 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4081
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4082 int Parser::isDeclaration(Token t, int needId, enum TOK endtok, Token *pt)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4083 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4084 //printf("isDeclaration(needId = %d)\n", needId);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4085 int haveId = 0;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4086
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4087 #if DMDV2
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4088 if ((t->value == TOKconst \|\|
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4089 t->value == TOKinvariant \|\|
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4090 t->value == TOKimmutable \|\|
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4091 t->value == TOKshared) &&
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4092 peek(t)->value != TOKlparen)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4093 { /* const type
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4094 * immutable type
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4095 * shared type
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4096 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4097 t = peek(t);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4098 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4099 #endif
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4100
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4101 if (!isBasicType(&t))
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4102 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4103 goto Lisnot;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4104 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4105 if (!isDeclarator(&t, &haveId, endtok))
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4106 goto Lisnot;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4107 if ( needId == 1 \|\|
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4108 (needId == 0 && !haveId) \|\|
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4109 (needId == 2 && haveId))
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4110 { if (pt)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4111 *pt = t;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4112 goto Lis;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4113 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4114 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4115 goto Lisnot;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4116
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4117 Lis:
1526 54b3c1394d62 Merged dmdfe 2.031. Robert Clipsham <robert@octarineparrot.com> parents: 1452 diff changeset	4118 //printf("\tis declaration, t = %s\n", t->toChars());
1452 638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4119 return TRUE;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4120
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4121 Lisnot:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4122 //printf("\tis not declaration\n");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4123 return FALSE;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4124 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4125
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4126 int Parser::isBasicType(Token **pt)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4127 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4128 // This code parallels parseBasicType()
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4129 Token t = pt;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4130 Token *t2;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4131 int parens;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4132 int haveId = 0;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4133
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4134 switch (t->value)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4135 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4136 CASE_BASIC_TYPES:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4137 t = peek(t);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4138 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4139
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4140 case TOKidentifier:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4141 L5:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4142 t = peek(t);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4143 if (t->value == TOKnot)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4144 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4145 goto L4;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4146 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4147 goto L3;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4148 while (1)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4149 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4150 L2:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4151 t = peek(t);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4152 L3:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4153 if (t->value == TOKdot)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4154 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4155 Ldot:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4156 t = peek(t);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4157 if (t->value != TOKidentifier)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4158 goto Lfalse;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4159 t = peek(t);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4160 if (t->value != TOKnot)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4161 goto L3;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4162 L4:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4163 /* Seen a !
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4164 * Look for:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4165 * !( args ), !identifier, etc.
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4166 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4167 t = peek(t);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4168 switch (t->value)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4169 { case TOKidentifier:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4170 goto L5;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4171 case TOKlparen:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4172 if (!skipParens(t, &t))
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4173 goto Lfalse;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4174 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4175 CASE_BASIC_TYPES:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4176 case TOKint32v:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4177 case TOKuns32v:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4178 case TOKint64v:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4179 case TOKuns64v:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4180 case TOKfloat32v:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4181 case TOKfloat64v:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4182 case TOKfloat80v:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4183 case TOKimaginary32v:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4184 case TOKimaginary64v:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4185 case TOKimaginary80v:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4186 case TOKnull:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4187 case TOKtrue:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4188 case TOKfalse:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4189 case TOKcharv:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4190 case TOKwcharv:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4191 case TOKdcharv:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4192 case TOKstring:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4193 case TOKfile:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4194 case TOKline:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4195 goto L2;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4196 default:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4197 goto Lfalse;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4198 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4199 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4200 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4201 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4202 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4203 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4204
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4205 case TOKdot:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4206 goto Ldot;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4207
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4208 case TOKtypeof:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4209 /* typeof(exp).identifier...
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4210 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4211 t = peek(t);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4212 if (t->value != TOKlparen)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4213 goto Lfalse;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4214 if (!skipParens(t, &t))
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4215 goto Lfalse;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4216 goto L2;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4217
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4218 case TOKconst:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4219 case TOKinvariant:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4220 case TOKimmutable:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4221 case TOKshared:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4222 // const(type) or immutable(type) or shared(type)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4223 t = peek(t);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4224 if (t->value != TOKlparen)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4225 goto Lfalse;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4226 t = peek(t);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4227 if (!isDeclaration(t, 0, TOKrparen, &t))
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4228 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4229 goto Lfalse;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4230 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4231 t = peek(t);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4232 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4233
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4234 default:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4235 goto Lfalse;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4236 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4237 *pt = t;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4238 //printf("is\n");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4239 return TRUE;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4240
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4241 Lfalse:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4242 //printf("is not\n");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4243 return FALSE;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4244 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4245
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4246 int Parser::isDeclarator(Token *pt, int haveId, enum TOK endtok)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4247 { // This code parallels parseDeclarator()
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4248 Token t = pt;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4249 int parens;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4250
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4251 //printf("Parser::isDeclarator()\n");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4252 //t->print();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4253 if (t->value == TOKassign)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4254 return FALSE;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4255
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4256 while (1)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4257 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4258 parens = FALSE;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4259 switch (t->value)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4260 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4261 case TOKmul:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4262 //case TOKand:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4263 t = peek(t);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4264 continue;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4265
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4266 case TOKlbracket:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4267 t = peek(t);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4268 if (t->value == TOKrbracket)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4269 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4270 t = peek(t);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4271 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4272 else if (isDeclaration(t, 0, TOKrbracket, &t))
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4273 { // It's an associative array declaration
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4274 t = peek(t);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4275 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4276 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4277 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4278 // [ expression ]
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4279 // [ expression .. expression ]
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4280 if (!isExpression(&t))
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4281 return FALSE;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4282 if (t->value == TOKslice)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4283 { t = peek(t);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4284 if (!isExpression(&t))
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4285 return FALSE;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4286 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4287 if (t->value != TOKrbracket)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4288 return FALSE;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4289 t = peek(t);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4290 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4291 continue;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4292
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4293 case TOKidentifier:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4294 if (*haveId)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4295 return FALSE;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4296 *haveId = TRUE;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4297 t = peek(t);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4298 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4299
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4300 case TOKlparen:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4301 t = peek(t);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4302
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4303 if (t->value == TOKrparen)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4304 return FALSE; // () is not a declarator
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4305
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4306 /* Regard ( identifier ) as not a declarator
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4307 * BUG: what about ( *identifier ) in
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4308 * f(*p)(x);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4309 * where f is a class instance with overloaded () ?
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4310 * Should we just disallow C-style function pointer declarations?
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4311 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4312 if (t->value == TOKidentifier)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4313 { Token *t2 = peek(t);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4314 if (t2->value == TOKrparen)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4315 return FALSE;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4316 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4317
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4318
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4319 if (!isDeclarator(&t, haveId, TOKrparen))
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4320 return FALSE;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4321 t = peek(t);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4322 parens = TRUE;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4323 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4324
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4325 case TOKdelegate:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4326 case TOKfunction:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4327 t = peek(t);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4328 if (!isParameters(&t))
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4329 return FALSE;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4330 continue;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4331 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4332 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4333 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4334
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4335 while (1)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4336 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4337 switch (t->value)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4338 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4339 #if CARRAYDECL
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4340 case TOKlbracket:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4341 parens = FALSE;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4342 t = peek(t);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4343 if (t->value == TOKrbracket)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4344 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4345 t = peek(t);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4346 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4347 else if (isDeclaration(t, 0, TOKrbracket, &t))
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4348 { // It's an associative array declaration
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4349 t = peek(t);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4350 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4351 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4352 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4353 // [ expression ]
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4354 if (!isExpression(&t))
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4355 return FALSE;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4356 if (t->value != TOKrbracket)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4357 return FALSE;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4358 t = peek(t);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4359 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4360 continue;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4361 #endif
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4362
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4363 case TOKlparen:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4364 parens = FALSE;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4365 if (!isParameters(&t))
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4366 return FALSE;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4367 #if DMDV2
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4368 while (1)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4369 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4370 switch (t->value)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4371 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4372 case TOKconst:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4373 case TOKinvariant:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4374 case TOKimmutable:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4375 case TOKshared:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4376 case TOKpure:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4377 case TOKnothrow:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4378 t = peek(t);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4379 continue;
1577 e4f7b5d9c68a DMD 2.032 Merge. Robert Clipsham <robert@octarineparrot.com> parents: 1526 diff changeset	4380 case TOKat:
e4f7b5d9c68a DMD 2.032 Merge. Robert Clipsham <robert@octarineparrot.com> parents: 1526 diff changeset	4381 t = peek(t); // skip '@'
e4f7b5d9c68a DMD 2.032 Merge. Robert Clipsham <robert@octarineparrot.com> parents: 1526 diff changeset	4382 t = peek(t); // skip identifier
e4f7b5d9c68a DMD 2.032 Merge. Robert Clipsham <robert@octarineparrot.com> parents: 1526 diff changeset	4383 continue;
1452 638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4384 default:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4385 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4386 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4387 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4388 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4389 #endif
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4390 continue;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4391
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4392 // Valid tokens that follow a declaration
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4393 case TOKrparen:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4394 case TOKrbracket:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4395 case TOKassign:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4396 case TOKcomma:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4397 case TOKsemicolon:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4398 case TOKlcurly:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4399 case TOKin:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4400 // The !parens is to disallow unnecessary parentheses
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4401 if (!parens && (endtok == TOKreserved \|\| endtok == t->value))
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4402 { *pt = t;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4403 return TRUE;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4404 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4405 return FALSE;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4406
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4407 default:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4408 return FALSE;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4409 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4410 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4411 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4412
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4413
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4414 int Parser::isParameters(Token **pt)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4415 { // This code parallels parseParameters()
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4416 Token t = pt;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4417
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4418 //printf("isParameters()\n");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4419 if (t->value != TOKlparen)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4420 return FALSE;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4421
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4422 t = peek(t);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4423 for (;1; t = peek(t))
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4424 {
1526 54b3c1394d62 Merged dmdfe 2.031. Robert Clipsham <robert@octarineparrot.com> parents: 1452 diff changeset	4425 L1:
1452 638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4426 switch (t->value)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4427 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4428 case TOKrparen:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4429 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4430
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4431 case TOKdotdotdot:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4432 t = peek(t);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4433 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4434
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4435 case TOKin:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4436 case TOKout:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4437 case TOKinout:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4438 case TOKref:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4439 case TOKlazy:
1526 54b3c1394d62 Merged dmdfe 2.031. Robert Clipsham <robert@octarineparrot.com> parents: 1452 diff changeset	4440 case TOKfinal:
54b3c1394d62 Merged dmdfe 2.031. Robert Clipsham <robert@octarineparrot.com> parents: 1452 diff changeset	4441 continue;
54b3c1394d62 Merged dmdfe 2.031. Robert Clipsham <robert@octarineparrot.com> parents: 1452 diff changeset	4442
1452 638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4443 case TOKconst:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4444 case TOKinvariant:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4445 case TOKimmutable:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4446 case TOKshared:
1526 54b3c1394d62 Merged dmdfe 2.031. Robert Clipsham <robert@octarineparrot.com> parents: 1452 diff changeset	4447 t = peek(t);
54b3c1394d62 Merged dmdfe 2.031. Robert Clipsham <robert@octarineparrot.com> parents: 1452 diff changeset	4448 if (t->value == TOKlparen)
54b3c1394d62 Merged dmdfe 2.031. Robert Clipsham <robert@octarineparrot.com> parents: 1452 diff changeset	4449 {
54b3c1394d62 Merged dmdfe 2.031. Robert Clipsham <robert@octarineparrot.com> parents: 1452 diff changeset	4450 t = peek(t);
54b3c1394d62 Merged dmdfe 2.031. Robert Clipsham <robert@octarineparrot.com> parents: 1452 diff changeset	4451 if (!isDeclaration(t, 0, TOKrparen, &t))
54b3c1394d62 Merged dmdfe 2.031. Robert Clipsham <robert@octarineparrot.com> parents: 1452 diff changeset	4452 return FALSE;
54b3c1394d62 Merged dmdfe 2.031. Robert Clipsham <robert@octarineparrot.com> parents: 1452 diff changeset	4453 t = peek(t); // skip past closing ')'
54b3c1394d62 Merged dmdfe 2.031. Robert Clipsham <robert@octarineparrot.com> parents: 1452 diff changeset	4454 goto L2;
54b3c1394d62 Merged dmdfe 2.031. Robert Clipsham <robert@octarineparrot.com> parents: 1452 diff changeset	4455 }
54b3c1394d62 Merged dmdfe 2.031. Robert Clipsham <robert@octarineparrot.com> parents: 1452 diff changeset	4456 goto L1;
1452 638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4457
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4458 #if 0
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4459 case TOKstatic:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4460 continue;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4461 case TOKauto:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4462 case TOKalias:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4463 t = peek(t);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4464 if (t->value == TOKidentifier)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4465 t = peek(t);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4466 if (t->value == TOKassign)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4467 { t = peek(t);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4468 if (!isExpression(&t))
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4469 return FALSE;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4470 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4471 goto L3;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4472 #endif
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4473
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4474 default:
1526 54b3c1394d62 Merged dmdfe 2.031. Robert Clipsham <robert@octarineparrot.com> parents: 1452 diff changeset	4475 { if (!isBasicType(&t))
1452 638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4476 return FALSE;
1526 54b3c1394d62 Merged dmdfe 2.031. Robert Clipsham <robert@octarineparrot.com> parents: 1452 diff changeset	4477 L2:
54b3c1394d62 Merged dmdfe 2.031. Robert Clipsham <robert@octarineparrot.com> parents: 1452 diff changeset	4478 int tmp = FALSE;
1452 638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4479 if (t->value != TOKdotdotdot &&
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4480 !isDeclarator(&t, &tmp, TOKreserved))
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4481 return FALSE;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4482 if (t->value == TOKassign)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4483 { t = peek(t);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4484 if (!isExpression(&t))
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4485 return FALSE;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4486 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4487 if (t->value == TOKdotdotdot)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4488 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4489 t = peek(t);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4490 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4491 }
1526 54b3c1394d62 Merged dmdfe 2.031. Robert Clipsham <robert@octarineparrot.com> parents: 1452 diff changeset	4492 }
1452 638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4493 L3:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4494 if (t->value == TOKcomma)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4495 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4496 continue;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4497 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4498 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4499 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4500 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4501 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4502 if (t->value != TOKrparen)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4503 return FALSE;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4504 t = peek(t);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4505 *pt = t;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4506 return TRUE;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4507 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4508
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4509 int Parser::isExpression(Token **pt)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4510 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4511 // This is supposed to determine if something is an expression.
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4512 // What it actually does is scan until a closing right bracket
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4513 // is found.
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4514
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4515 Token t = pt;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4516 int brnest = 0;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4517 int panest = 0;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4518 int curlynest = 0;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4519
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4520 for (;; t = peek(t))
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4521 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4522 switch (t->value)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4523 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4524 case TOKlbracket:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4525 brnest++;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4526 continue;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4527
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4528 case TOKrbracket:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4529 if (--brnest >= 0)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4530 continue;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4531 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4532
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4533 case TOKlparen:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4534 panest++;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4535 continue;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4536
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4537 case TOKcomma:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4538 if (brnest \|\| panest)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4539 continue;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4540 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4541
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4542 case TOKrparen:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4543 if (--panest >= 0)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4544 continue;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4545 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4546
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4547 case TOKlcurly:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4548 curlynest++;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4549 continue;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4550
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4551 case TOKrcurly:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4552 if (--curlynest >= 0)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4553 continue;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4554 return FALSE;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4555
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4556 case TOKslice:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4557 if (brnest)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4558 continue;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4559 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4560
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4561 case TOKsemicolon:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4562 if (curlynest)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4563 continue;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4564 return FALSE;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4565
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4566 case TOKeof:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4567 return FALSE;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4568
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4569 default:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4570 continue;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4571 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4572 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4573 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4574
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4575 *pt = t;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4576 return TRUE;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4577 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4578
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4579 /**********************************************
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4580 * Skip over
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4581 * instance foo.bar(parameters...)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4582 * Output:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4583 * if (pt), *pt is set to the token following the closing )
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4584 * Returns:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4585 * 1 it's valid instance syntax
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4586 * 0 invalid instance syntax
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4587 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4588
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4589 int Parser::isTemplateInstance(Token t, Token *pt)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4590 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4591 t = peek(t);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4592 if (t->value != TOKdot)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4593 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4594 if (t->value != TOKidentifier)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4595 goto Lfalse;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4596 t = peek(t);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4597 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4598 while (t->value == TOKdot)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4599 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4600 t = peek(t);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4601 if (t->value != TOKidentifier)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4602 goto Lfalse;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4603 t = peek(t);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4604 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4605 if (t->value != TOKlparen)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4606 goto Lfalse;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4607
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4608 // Skip over the template arguments
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4609 while (1)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4610 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4611 while (1)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4612 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4613 t = peek(t);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4614 switch (t->value)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4615 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4616 case TOKlparen:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4617 if (!skipParens(t, &t))
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4618 goto Lfalse;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4619 continue;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4620 case TOKrparen:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4621 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4622 case TOKcomma:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4623 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4624 case TOKeof:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4625 case TOKsemicolon:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4626 goto Lfalse;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4627 default:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4628 continue;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4629 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4630 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4631 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4632
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4633 if (t->value != TOKcomma)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4634 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4635 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4636 if (t->value != TOKrparen)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4637 goto Lfalse;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4638 t = peek(t);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4639 if (pt)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4640 *pt = t;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4641 return 1;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4642
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4643 Lfalse:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4644 return 0;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4645 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4646
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4647 /*******************************************
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4648 * Skip parens, brackets.
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4649 * Input:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4650 * t is on opening (
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4651 * Output:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4652 * *pt is set to closing token, which is ')' on success
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4653 * Returns:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4654 * !=0 successful
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4655 * 0 some parsing error
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4656 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4657
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4658 int Parser::skipParens(Token t, Token *pt)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4659 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4660 int parens = 0;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4661
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4662 while (1)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4663 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4664 switch (t->value)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4665 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4666 case TOKlparen:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4667 parens++;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4668 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4669
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4670 case TOKrparen:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4671 parens--;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4672 if (parens < 0)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4673 goto Lfalse;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4674 if (parens == 0)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4675 goto Ldone;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4676 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4677
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4678 case TOKeof:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4679 case TOKsemicolon:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4680 goto Lfalse;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4681
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4682 default:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4683 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4684 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4685 t = peek(t);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4686 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4687
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4688 Ldone:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4689 if (*pt)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4690 *pt = t;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4691 return 1;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4692
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4693 Lfalse:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4694 return 0;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4695 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4696
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4697 /******************************* Expression Parser *************************/
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4698
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4699 Expression *Parser::parsePrimaryExp()
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4700 { Expression *e;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4701 Type *t;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4702 Identifier *id;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4703 enum TOK save;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4704 Loc loc = this->loc;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4705
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4706 //printf("parsePrimaryExp(): loc = %d\n", loc.linnum);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4707 switch (token.value)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4708 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4709 case TOKidentifier:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4710 id = token.ident;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4711 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4712 if (token.value == TOKnot && peekNext() != TOKis)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4713 { // identifier!(template-argument-list)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4714 TemplateInstance *tempinst;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4715
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4716 tempinst = new TemplateInstance(loc, id);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4717 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4718 if (token.value == TOKlparen)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4719 // ident!(template_arguments)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4720 tempinst->tiargs = parseTemplateArgumentList();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4721 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4722 // ident!template_argument
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4723 tempinst->tiargs = parseTemplateArgument();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4724 e = new ScopeExp(loc, tempinst);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4725 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4726 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4727 e = new IdentifierExp(loc, id);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4728 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4729
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4730 case TOKdollar:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4731 if (!inBrackets)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4732 error("'$' is valid only inside [] of index or slice");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4733 e = new DollarExp(loc);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4734 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4735 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4736
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4737 case TOKdot:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4738 // Signal global scope '.' operator with "" identifier
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4739 e = new IdentifierExp(loc, Id::empty);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4740 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4741
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4742 case TOKthis:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4743 e = new ThisExp(loc);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4744 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4745 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4746
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4747 case TOKsuper:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4748 e = new SuperExp(loc);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4749 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4750 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4751
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4752 case TOKint32v:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4753 e = new IntegerExp(loc, (d_int32)token.int64value, Type::tint32);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4754 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4755 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4756
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4757 case TOKuns32v:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4758 e = new IntegerExp(loc, (d_uns32)token.uns64value, Type::tuns32);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4759 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4760 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4761
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4762 case TOKint64v:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4763 e = new IntegerExp(loc, token.int64value, Type::tint64);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4764 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4765 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4766
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4767 case TOKuns64v:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4768 e = new IntegerExp(loc, token.uns64value, Type::tuns64);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4769 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4770 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4771
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4772 case TOKfloat32v:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4773 e = new RealExp(loc, token.float80value, Type::tfloat32);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4774 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4775 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4776
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4777 case TOKfloat64v:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4778 e = new RealExp(loc, token.float80value, Type::tfloat64);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4779 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4780 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4781
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4782 case TOKfloat80v:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4783 e = new RealExp(loc, token.float80value, Type::tfloat80);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4784 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4785 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4786
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4787 case TOKimaginary32v:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4788 e = new RealExp(loc, token.float80value, Type::timaginary32);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4789 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4790 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4791
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4792 case TOKimaginary64v:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4793 e = new RealExp(loc, token.float80value, Type::timaginary64);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4794 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4795 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4796
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4797 case TOKimaginary80v:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4798 e = new RealExp(loc, token.float80value, Type::timaginary80);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4799 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4800 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4801
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4802 case TOKnull:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4803 e = new NullExp(loc);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4804 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4805 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4806
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4807 #if DMDV2
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4808 case TOKfile:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4809 { const char *s = loc.filename ? loc.filename : mod->ident->toChars();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4810 e = new StringExp(loc, (char *)s, strlen(s), 0);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4811 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4812 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4813 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4814
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4815 case TOKline:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4816 e = new IntegerExp(loc, loc.linnum, Type::tint32);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4817 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4818 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4819 #endif
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4820
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4821 case TOKtrue:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4822 e = new IntegerExp(loc, 1, Type::tbool);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4823 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4824 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4825
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4826 case TOKfalse:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4827 e = new IntegerExp(loc, 0, Type::tbool);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4828 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4829 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4830
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4831 case TOKcharv:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4832 e = new IntegerExp(loc, (d_uns8)token.uns64value, Type::tchar);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4833 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4834 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4835
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4836 case TOKwcharv:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4837 e = new IntegerExp(loc, (d_uns16)token.uns64value, Type::twchar);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4838 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4839 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4840
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4841 case TOKdcharv:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4842 e = new IntegerExp(loc, (d_uns32)token.uns64value, Type::tdchar);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4843 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4844 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4845
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4846 case TOKstring:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4847 { unsigned char *s;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4848 unsigned len;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4849 unsigned char postfix;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4850
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4851 // cat adjacent strings
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4852 s = token.ustring;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4853 len = token.len;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4854 postfix = token.postfix;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4855 while (1)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4856 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4857 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4858 if (token.value == TOKstring)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4859 { unsigned len1;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4860 unsigned len2;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4861 unsigned char *s2;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4862
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4863 if (token.postfix)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4864 { if (token.postfix != postfix)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4865 error("mismatched string literal postfixes '%c' and '%c'", postfix, token.postfix);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4866 postfix = token.postfix;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4867 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4868
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4869 len1 = len;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4870 len2 = token.len;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4871 len = len1 + len2;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4872 s2 = (unsigned char )mem.malloc((len + 1) sizeof(unsigned char));
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4873 memcpy(s2, s, len1 * sizeof(unsigned char));
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4874 memcpy(s2 + len1, token.ustring, (len2 + 1) * sizeof(unsigned char));
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4875 s = s2;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4876 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4877 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4878 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4879 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4880 e = new StringExp(loc, s, len, postfix);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4881 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4882 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4883
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4884 CASE_BASIC_TYPES_X(t):
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4885 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4886 L1:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4887 check(TOKdot, t->toChars());
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4888 if (token.value != TOKidentifier)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4889 { error("found '%s' when expecting identifier following '%s.'", token.toChars(), t->toChars());
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4890 goto Lerr;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4891 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4892 e = typeDotIdExp(loc, t, token.ident);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4893 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4894 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4895
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4896 case TOKtypeof:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4897 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4898 t = parseTypeof();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4899 e = new TypeExp(loc, t);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4900 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4901 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4902
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4903 case TOKtypeid:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4904 { Type *t;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4905
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4906 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4907 check(TOKlparen, "typeid");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4908 t = parseType(); // ( type )
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4909 check(TOKrparen);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4910 e = new TypeidExp(loc, t);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4911 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4912 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4913
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4914 #if DMDV2
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4915 case TOKtraits:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4916 { /* __traits(identifier, args...)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4917 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4918 Identifier *ident;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4919 Objects *args = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4920
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4921 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4922 check(TOKlparen);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4923 if (token.value != TOKidentifier)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4924 { error("__traits(identifier, args...) expected");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4925 goto Lerr;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4926 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4927 ident = token.ident;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4928 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4929 if (token.value == TOKcomma)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4930 args = parseTemplateArgumentList2(); // __traits(identifier, args...)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4931 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4932 check(TOKrparen); // __traits(identifier)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4933
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4934 e = new TraitsExp(loc, ident, args);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4935 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4936 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4937 #endif
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4938
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4939 case TOKis:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4940 { Type *targ;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4941 Identifier *ident = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4942 Type *tspec = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4943 enum TOK tok = TOKreserved;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4944 enum TOK tok2 = TOKreserved;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4945 TemplateParameters *tpl = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4946 Loc loc = this->loc;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4947
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4948 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4949 if (token.value == TOKlparen)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4950 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4951 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4952 targ = parseType(&ident);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4953 if (token.value == TOKcolon \|\| token.value == TOKequal)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4954 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4955 tok = token.value;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4956 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4957 if (tok == TOKequal &&
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4958 (token.value == TOKtypedef \|\|
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4959 token.value == TOKstruct \|\|
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4960 token.value == TOKunion \|\|
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4961 token.value == TOKclass \|\|
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4962 token.value == TOKsuper \|\|
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4963 token.value == TOKenum \|\|
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4964 token.value == TOKinterface \|\|
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4965 #if DMDV2
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4966 token.value == TOKconst && peek(&token)->value == TOKrparen \|\|
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4967 token.value == TOKinvariant && peek(&token)->value == TOKrparen \|\|
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4968 token.value == TOKimmutable && peek(&token)->value == TOKrparen \|\|
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4969 token.value == TOKshared && peek(&token)->value == TOKrparen \|\|
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4970 #endif
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4971 token.value == TOKfunction \|\|
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4972 token.value == TOKdelegate \|\|
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4973 token.value == TOKreturn))
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4974 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4975 tok2 = token.value;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4976 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4977 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4978 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4979 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4980 tspec = parseType();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4981 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4982 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4983 if (ident && tspec)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4984 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4985 if (token.value == TOKcomma)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4986 tpl = parseTemplateParameterList(1);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4987 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4988 { tpl = new TemplateParameters();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4989 check(TOKrparen);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4990 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4991 TemplateParameter *tp = new TemplateTypeParameter(loc, ident, NULL, NULL);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4992 tpl->insert(0, tp);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4993 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4994 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4995 check(TOKrparen);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4996 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4997 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4998 { error("(type identifier : specialization) expected following is");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	4999 goto Lerr;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5000 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5001 e = new IsExp(loc, targ, ident, tok, tspec, tok2, tpl);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5002 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5003 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5004
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5005 case TOKassert:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5006 { Expression *msg = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5007
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5008 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5009 check(TOKlparen, "assert");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5010 e = parseAssignExp();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5011 if (token.value == TOKcomma)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5012 { nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5013 msg = parseAssignExp();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5014 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5015 check(TOKrparen);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5016 e = new AssertExp(loc, e, msg);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5017 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5018 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5019
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5020 case TOKmixin:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5021 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5022 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5023 check(TOKlparen, "mixin");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5024 e = parseAssignExp();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5025 check(TOKrparen);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5026 e = new CompileExp(loc, e);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5027 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5028 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5029
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5030 case TOKimport:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5031 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5032 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5033 check(TOKlparen, "import");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5034 e = parseAssignExp();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5035 check(TOKrparen);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5036 e = new FileExp(loc, e);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5037 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5038 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5039
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5040 case TOKlparen:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5041 if (peekPastParen(&token)->value == TOKlcurly)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5042 { // (arguments) { statements... }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5043 save = TOKdelegate;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5044 goto case_delegate;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5045 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5046 // ( expression )
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5047 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5048 e = parseExpression();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5049 check(loc, TOKrparen);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5050 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5051
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5052 case TOKlbracket:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5053 { /* Parse array literals and associative array literals:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5054 * [ value, value, value ... ]
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5055 * [ key:value, key:value, key:value ... ]
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5056 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5057 Expressions *values = new Expressions();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5058 Expressions *keys = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5059
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5060 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5061 if (token.value != TOKrbracket)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5062 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5063 while (token.value != TOKeof)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5064 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5065 Expression *e = parseAssignExp();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5066 if (token.value == TOKcolon && (keys \|\| values->dim == 0))
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5067 { nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5068 if (!keys)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5069 keys = new Expressions();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5070 keys->push(e);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5071 e = parseAssignExp();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5072 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5073 else if (keys)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5074 { error("'key:value' expected for associative array literal");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5075 delete keys;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5076 keys = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5077 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5078 values->push(e);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5079 if (token.value == TOKrbracket)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5080 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5081 check(TOKcomma);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5082 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5083 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5084 check(TOKrbracket);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5085
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5086 if (keys)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5087 e = new AssocArrayLiteralExp(loc, keys, values);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5088 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5089 e = new ArrayLiteralExp(loc, values);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5090 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5091 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5092
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5093 case TOKlcurly:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5094 // { statements... }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5095 save = TOKdelegate;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5096 goto case_delegate;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5097
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5098 case TOKfunction:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5099 case TOKdelegate:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5100 save = token.value;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5101 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5102 case_delegate:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5103 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5104 /* function type(parameters) { body } pure nothrow
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5105 * delegate type(parameters) { body } pure nothrow
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5106 * (parameters) { body }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5107 * { body }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5108 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5109 Arguments *arguments;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5110 int varargs;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5111 FuncLiteralDeclaration *fd;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5112 Type *t;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5113 bool isnothrow = false;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5114 bool ispure = false;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5115
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5116 if (token.value == TOKlcurly)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5117 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5118 t = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5119 varargs = 0;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5120 arguments = new Arguments();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5121 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5122 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5123 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5124 if (token.value == TOKlparen)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5125 t = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5126 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5127 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5128 t = parseBasicType();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5129 t = parseBasicType2(t); // function return type
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5130 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5131 arguments = parseParameters(&varargs);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5132 while (1)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5133 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5134 if (token.value == TOKpure)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5135 ispure = true;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5136 else if (token.value == TOKnothrow)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5137 isnothrow = true;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5138 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5139 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5140 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5141 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5142 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5143
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5144 TypeFunction *tf = new TypeFunction(arguments, t, varargs, linkage);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5145 tf->ispure = ispure;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5146 tf->isnothrow = isnothrow;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5147 fd = new FuncLiteralDeclaration(loc, 0, tf, save, NULL);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5148 parseContracts(fd);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5149 e = new FuncExp(loc, fd);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5150 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5151 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5152
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5153 default:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5154 error("expression expected, not '%s'", token.toChars());
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5155 Lerr:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5156 // Anything for e, as long as it's not NULL
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5157 e = new IntegerExp(loc, 0, Type::tint32);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5158 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5159 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5160 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5161 return e;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5162 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5163
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5164 Expression Parser::parsePostExp(Expression e)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5165 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5166 Loc loc;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5167
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5168 while (1)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5169 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5170 loc = this->loc;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5171 switch (token.value)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5172 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5173 case TOKdot:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5174 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5175 if (token.value == TOKidentifier)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5176 { Identifier *id = token.ident;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5177
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5178 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5179 if (token.value == TOKnot && peekNext() != TOKis)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5180 { // identifier!(template-argument-list)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5181 TemplateInstance *tempinst = new TemplateInstance(loc, id);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5182 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5183 if (token.value == TOKlparen)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5184 // ident!(template_arguments)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5185 tempinst->tiargs = parseTemplateArgumentList();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5186 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5187 // ident!template_argument
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5188 tempinst->tiargs = parseTemplateArgument();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5189 e = new DotTemplateInstanceExp(loc, e, tempinst);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5190 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5191 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5192 e = new DotIdExp(loc, e, id);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5193 continue;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5194 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5195 else if (token.value == TOKnew)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5196 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5197 e = parseNewExp(e);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5198 continue;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5199 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5200 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5201 error("identifier expected following '.', not '%s'", token.toChars());
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5202 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5203
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5204 case TOKplusplus:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5205 e = new PostExp(TOKplusplus, loc, e);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5206 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5207
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5208 case TOKminusminus:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5209 e = new PostExp(TOKminusminus, loc, e);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5210 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5211
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5212 case TOKlparen:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5213 e = new CallExp(loc, e, parseArguments());
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5214 continue;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5215
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5216 case TOKlbracket:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5217 { // array dereferences:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5218 // array[index]
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5219 // array[]
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5220 // array[lwr .. upr]
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5221 Expression *index;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5222 Expression *upr;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5223
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5224 inBrackets++;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5225 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5226 if (token.value == TOKrbracket)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5227 { // array[]
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5228 e = new SliceExp(loc, e, NULL, NULL);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5229 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5230 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5231 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5232 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5233 index = parseAssignExp();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5234 if (token.value == TOKslice)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5235 { // array[lwr .. upr]
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5236 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5237 upr = parseAssignExp();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5238 e = new SliceExp(loc, e, index, upr);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5239 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5240 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5241 { // array[index, i2, i3, i4, ...]
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5242 Expressions *arguments = new Expressions();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5243 arguments->push(index);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5244 if (token.value == TOKcomma)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5245 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5246 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5247 while (1)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5248 { Expression *arg;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5249
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5250 arg = parseAssignExp();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5251 arguments->push(arg);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5252 if (token.value == TOKrbracket)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5253 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5254 check(TOKcomma);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5255 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5256 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5257 e = new ArrayExp(loc, e, arguments);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5258 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5259 check(TOKrbracket);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5260 inBrackets--;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5261 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5262 continue;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5263 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5264
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5265 default:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5266 return e;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5267 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5268 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5269 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5270 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5271
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5272 Expression *Parser::parseUnaryExp()
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5273 { Expression *e;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5274 Loc loc = this->loc;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5275
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5276 switch (token.value)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5277 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5278 case TOKand:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5279 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5280 e = parseUnaryExp();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5281 e = new AddrExp(loc, e);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5282 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5283
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5284 case TOKplusplus:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5285 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5286 e = parseUnaryExp();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5287 e = new AddAssignExp(loc, e, new IntegerExp(loc, 1, Type::tint32));
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5288 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5289
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5290 case TOKminusminus:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5291 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5292 e = parseUnaryExp();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5293 e = new MinAssignExp(loc, e, new IntegerExp(loc, 1, Type::tint32));
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5294 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5295
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5296 case TOKmul:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5297 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5298 e = parseUnaryExp();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5299 e = new PtrExp(loc, e);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5300 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5301
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5302 case TOKmin:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5303 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5304 e = parseUnaryExp();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5305 e = new NegExp(loc, e);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5306 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5307
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5308 case TOKadd:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5309 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5310 e = parseUnaryExp();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5311 e = new UAddExp(loc, e);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5312 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5313
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5314 case TOKnot:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5315 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5316 e = parseUnaryExp();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5317 e = new NotExp(loc, e);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5318 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5319
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5320 case TOKtilde:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5321 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5322 e = parseUnaryExp();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5323 e = new ComExp(loc, e);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5324 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5325
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5326 case TOKdelete:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5327 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5328 e = parseUnaryExp();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5329 e = new DeleteExp(loc, e);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5330 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5331
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5332 case TOKnew:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5333 e = parseNewExp(NULL);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5334 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5335
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5336 case TOKcast: // cast(type) expression
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5337 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5338 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5339 check(TOKlparen);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5340 /* Look for cast(), cast(const), cast(immutable),
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5341 * cast(shared), cast(shared const)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5342 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5343 unsigned m;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5344 if (token.value == TOKrparen)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5345 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5346 m = 0;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5347 goto Lmod1;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5348 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5349 else if (token.value == TOKconst && peekNext() == TOKrparen)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5350 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5351 m = MODconst;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5352 goto Lmod2;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5353 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5354 else if ((token.value == TOKimmutable \|\| token.value == TOKinvariant) && peekNext() == TOKrparen)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5355 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5356 m = MODinvariant;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5357 goto Lmod2;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5358 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5359 else if (token.value == TOKshared && peekNext() == TOKrparen)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5360 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5361 m = MODshared;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5362 goto Lmod2;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5363 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5364 else if (token.value == TOKconst && peekNext() == TOKshared && peekNext2() == TOKrparen \|\|
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5365 token.value == TOKshared && peekNext() == TOKconst && peekNext2() == TOKrparen)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5366 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5367 m = MODshared \| MODconst;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5368 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5369 Lmod2:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5370 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5371 Lmod1:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5372 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5373 e = parseUnaryExp();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5374 e = new CastExp(loc, e, m);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5375 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5376 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5377 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5378 Type *t = parseType(); // ( type )
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5379 check(TOKrparen);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5380 e = parseUnaryExp();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5381 e = new CastExp(loc, e, t);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5382 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5383 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5384 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5385
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5386 case TOKlparen:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5387 { Token *tk;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5388
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5389 tk = peek(&token);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5390 #if CCASTSYNTAX
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5391 // If cast
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5392 if (isDeclaration(tk, 0, TOKrparen, &tk))
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5393 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5394 tk = peek(tk); // skip over right parenthesis
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5395 switch (tk->value)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5396 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5397 case TOKnot:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5398 tk = peek(tk);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5399 if (tk->value == TOKis) // !is
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5400 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5401 case TOKdot:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5402 case TOKplusplus:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5403 case TOKminusminus:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5404 case TOKdelete:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5405 case TOKnew:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5406 case TOKlparen:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5407 case TOKidentifier:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5408 case TOKthis:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5409 case TOKsuper:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5410 case TOKint32v:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5411 case TOKuns32v:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5412 case TOKint64v:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5413 case TOKuns64v:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5414 case TOKfloat32v:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5415 case TOKfloat64v:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5416 case TOKfloat80v:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5417 case TOKimaginary32v:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5418 case TOKimaginary64v:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5419 case TOKimaginary80v:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5420 case TOKnull:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5421 case TOKtrue:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5422 case TOKfalse:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5423 case TOKcharv:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5424 case TOKwcharv:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5425 case TOKdcharv:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5426 case TOKstring:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5427 #if 0
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5428 case TOKtilde:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5429 case TOKand:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5430 case TOKmul:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5431 case TOKmin:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5432 case TOKadd:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5433 #endif
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5434 case TOKfunction:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5435 case TOKdelegate:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5436 case TOKtypeof:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5437 #if DMDV2
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5438 case TOKfile:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5439 case TOKline:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5440 #endif
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5441 CASE_BASIC_TYPES: // (type)int.size
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5442 { // (type) una_exp
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5443 Type *t;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5444
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5445 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5446 t = parseType();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5447 check(TOKrparen);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5448
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5449 // if .identifier
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5450 if (token.value == TOKdot)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5451 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5452 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5453 if (token.value != TOKidentifier)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5454 { error("Identifier expected following (type).");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5455 return NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5456 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5457 e = typeDotIdExp(loc, t, token.ident);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5458 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5459 e = parsePostExp(e);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5460 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5461 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5462 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5463 e = parseUnaryExp();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5464 e = new CastExp(loc, e, t);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5465 error("C style cast illegal, use %s", e->toChars());
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5466 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5467 return e;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5468 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5469 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5470 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5471 #endif
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5472 e = parsePrimaryExp();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5473 e = parsePostExp(e);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5474 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5475 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5476 default:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5477 e = parsePrimaryExp();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5478 e = parsePostExp(e);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5479 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5480 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5481 assert(e);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5482 return e;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5483 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5484
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5485 Expression *Parser::parseMulExp()
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5486 { Expression *e;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5487 Expression *e2;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5488 Loc loc = this->loc;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5489
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5490 e = parseUnaryExp();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5491 while (1)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5492 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5493 switch (token.value)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5494 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5495 case TOKmul: nextToken(); e2 = parseUnaryExp(); e = new MulExp(loc,e,e2); continue;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5496 case TOKdiv: nextToken(); e2 = parseUnaryExp(); e = new DivExp(loc,e,e2); continue;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5497 case TOKmod: nextToken(); e2 = parseUnaryExp(); e = new ModExp(loc,e,e2); continue;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5498
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5499 default:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5500 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5501 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5502 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5503 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5504 return e;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5505 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5506
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5507 Expression *Parser::parseAddExp()
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5508 { Expression *e;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5509 Expression *e2;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5510 Loc loc = this->loc;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5511
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5512 e = parseMulExp();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5513 while (1)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5514 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5515 switch (token.value)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5516 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5517 case TOKadd: nextToken(); e2 = parseMulExp(); e = new AddExp(loc,e,e2); continue;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5518 case TOKmin: nextToken(); e2 = parseMulExp(); e = new MinExp(loc,e,e2); continue;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5519 case TOKtilde: nextToken(); e2 = parseMulExp(); e = new CatExp(loc,e,e2); continue;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5520
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5521 default:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5522 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5523 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5524 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5525 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5526 return e;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5527 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5528
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5529 Expression *Parser::parseShiftExp()
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5530 { Expression *e;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5531 Expression *e2;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5532 Loc loc = this->loc;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5533
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5534 e = parseAddExp();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5535 while (1)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5536 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5537 switch (token.value)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5538 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5539 case TOKshl: nextToken(); e2 = parseAddExp(); e = new ShlExp(loc,e,e2); continue;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5540 case TOKshr: nextToken(); e2 = parseAddExp(); e = new ShrExp(loc,e,e2); continue;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5541 case TOKushr: nextToken(); e2 = parseAddExp(); e = new UshrExp(loc,e,e2); continue;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5542
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5543 default:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5544 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5545 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5546 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5547 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5548 return e;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5549 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5550
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5551 Expression *Parser::parseRelExp()
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5552 { Expression *e;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5553 Expression *e2;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5554 enum TOK op;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5555 Loc loc = this->loc;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5556
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5557 e = parseShiftExp();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5558 while (1)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5559 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5560 switch (token.value)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5561 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5562 case TOKlt:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5563 case TOKle:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5564 case TOKgt:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5565 case TOKge:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5566 case TOKunord:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5567 case TOKlg:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5568 case TOKleg:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5569 case TOKule:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5570 case TOKul:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5571 case TOKuge:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5572 case TOKug:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5573 case TOKue:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5574 op = token.value;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5575 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5576 e2 = parseShiftExp();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5577 e = new CmpExp(op, loc, e, e2);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5578 continue;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5579
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5580 case TOKin:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5581 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5582 e2 = parseShiftExp();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5583 e = new InExp(loc, e, e2);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5584 continue;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5585
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5586 default:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5587 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5588 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5589 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5590 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5591 return e;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5592 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5593
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5594 Expression *Parser::parseEqualExp()
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5595 { Expression *e;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5596 Expression *e2;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5597 Token *t;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5598 Loc loc = this->loc;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5599
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5600 e = parseRelExp();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5601 while (1)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5602 { enum TOK value = token.value;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5603
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5604 switch (value)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5605 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5606 case TOKequal:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5607 case TOKnotequal:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5608 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5609 e2 = parseRelExp();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5610 e = new EqualExp(value, loc, e, e2);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5611 continue;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5612
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5613 case TOKidentity:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5614 error("'===' is no longer legal, use 'is' instead");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5615 goto L1;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5616
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5617 case TOKnotidentity:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5618 error("'!==' is no longer legal, use '!is' instead");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5619 goto L1;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5620
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5621 case TOKis:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5622 value = TOKidentity;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5623 goto L1;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5624
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5625 case TOKnot:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5626 // Attempt to identify '!is'
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5627 t = peek(&token);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5628 if (t->value != TOKis)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5629 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5630 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5631 value = TOKnotidentity;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5632 goto L1;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5633
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5634 L1:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5635 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5636 e2 = parseRelExp();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5637 e = new IdentityExp(value, loc, e, e2);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5638 continue;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5639
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5640 default:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5641 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5642 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5643 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5644 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5645 return e;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5646 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5647
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5648 Expression *Parser::parseCmpExp()
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5649 { Expression *e;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5650 Expression *e2;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5651 Token *t;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5652 Loc loc = this->loc;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5653
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5654 e = parseShiftExp();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5655 enum TOK op = token.value;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5656
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5657 switch (op)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5658 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5659 case TOKequal:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5660 case TOKnotequal:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5661 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5662 e2 = parseShiftExp();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5663 e = new EqualExp(op, loc, e, e2);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5664 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5665
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5666 case TOKis:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5667 op = TOKidentity;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5668 goto L1;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5669
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5670 case TOKnot:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5671 // Attempt to identify '!is'
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5672 t = peek(&token);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5673 if (t->value != TOKis)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5674 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5675 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5676 op = TOKnotidentity;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5677 goto L1;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5678
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5679 L1:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5680 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5681 e2 = parseShiftExp();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5682 e = new IdentityExp(op, loc, e, e2);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5683 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5684
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5685 case TOKlt:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5686 case TOKle:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5687 case TOKgt:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5688 case TOKge:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5689 case TOKunord:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5690 case TOKlg:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5691 case TOKleg:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5692 case TOKule:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5693 case TOKul:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5694 case TOKuge:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5695 case TOKug:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5696 case TOKue:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5697 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5698 e2 = parseShiftExp();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5699 e = new CmpExp(op, loc, e, e2);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5700 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5701
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5702 case TOKin:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5703 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5704 e2 = parseShiftExp();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5705 e = new InExp(loc, e, e2);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5706 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5707
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5708 default:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5709 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5710 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5711 return e;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5712 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5713
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5714 Expression *Parser::parseAndExp()
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5715 { Expression *e;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5716 Expression *e2;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5717 Loc loc = this->loc;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5718
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5719 if (global.params.Dversion == 1)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5720 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5721 e = parseEqualExp();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5722 while (token.value == TOKand)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5723 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5724 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5725 e2 = parseEqualExp();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5726 e = new AndExp(loc,e,e2);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5727 loc = this->loc;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5728 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5729 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5730 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5731 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5732 e = parseCmpExp();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5733 while (token.value == TOKand)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5734 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5735 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5736 e2 = parseCmpExp();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5737 e = new AndExp(loc,e,e2);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5738 loc = this->loc;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5739 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5740 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5741 return e;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5742 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5743
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5744 Expression *Parser::parseXorExp()
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5745 { Expression *e;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5746 Expression *e2;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5747 Loc loc = this->loc;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5748
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5749 e = parseAndExp();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5750 while (token.value == TOKxor)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5751 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5752 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5753 e2 = parseAndExp();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5754 e = new XorExp(loc, e, e2);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5755 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5756 return e;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5757 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5758
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5759 Expression *Parser::parseOrExp()
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5760 { Expression *e;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5761 Expression *e2;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5762 Loc loc = this->loc;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5763
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5764 e = parseXorExp();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5765 while (token.value == TOKor)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5766 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5767 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5768 e2 = parseXorExp();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5769 e = new OrExp(loc, e, e2);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5770 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5771 return e;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5772 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5773
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5774 Expression *Parser::parseAndAndExp()
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5775 { Expression *e;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5776 Expression *e2;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5777 Loc loc = this->loc;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5778
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5779 e = parseOrExp();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5780 while (token.value == TOKandand)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5781 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5782 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5783 e2 = parseOrExp();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5784 e = new AndAndExp(loc, e, e2);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5785 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5786 return e;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5787 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5788
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5789 Expression *Parser::parseOrOrExp()
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5790 { Expression *e;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5791 Expression *e2;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5792 Loc loc = this->loc;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5793
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5794 e = parseAndAndExp();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5795 while (token.value == TOKoror)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5796 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5797 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5798 e2 = parseAndAndExp();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5799 e = new OrOrExp(loc, e, e2);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5800 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5801 return e;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5802 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5803
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5804 Expression *Parser::parseCondExp()
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5805 { Expression *e;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5806 Expression *e1;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5807 Expression *e2;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5808 Loc loc = this->loc;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5809
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5810 e = parseOrOrExp();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5811 if (token.value == TOKquestion)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5812 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5813 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5814 e1 = parseExpression();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5815 check(TOKcolon);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5816 e2 = parseCondExp();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5817 e = new CondExp(loc, e, e1, e2);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5818 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5819 return e;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5820 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5821
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5822 Expression *Parser::parseAssignExp()
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5823 { Expression *e;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5824 Expression *e2;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5825 Loc loc;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5826
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5827 e = parseCondExp();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5828 while (1)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5829 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5830 loc = this->loc;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5831 switch (token.value)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5832 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5833 #define X(tok,ector) \
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5834 case tok: nextToken(); e2 = parseAssignExp(); e = new ector(loc,e,e2); continue;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5835
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5836 X(TOKassign, AssignExp);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5837 X(TOKaddass, AddAssignExp);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5838 X(TOKminass, MinAssignExp);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5839 X(TOKmulass, MulAssignExp);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5840 X(TOKdivass, DivAssignExp);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5841 X(TOKmodass, ModAssignExp);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5842 X(TOKandass, AndAssignExp);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5843 X(TOKorass, OrAssignExp);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5844 X(TOKxorass, XorAssignExp);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5845 X(TOKshlass, ShlAssignExp);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5846 X(TOKshrass, ShrAssignExp);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5847 X(TOKushrass, UshrAssignExp);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5848 X(TOKcatass, CatAssignExp);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5849
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5850 #undef X
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5851 default:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5852 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5853 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5854 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5855 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5856 return e;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5857 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5858
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5859 Expression *Parser::parseExpression()
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5860 { Expression *e;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5861 Expression *e2;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5862 Loc loc = this->loc;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5863
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5864 //printf("Parser::parseExpression() loc = %d\n", loc.linnum);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5865 e = parseAssignExp();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5866 while (token.value == TOKcomma)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5867 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5868 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5869 e2 = parseAssignExp();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5870 e = new CommaExp(loc, e, e2);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5871 loc = this->loc;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5872 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5873 return e;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5874 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5875
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5876
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5877 /*************************
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5878 * Collect argument list.
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5879 * Assume current token is ',', '(' or '['.
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5880 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5881
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5882 Expressions *Parser::parseArguments()
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5883 { // function call
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5884 Expressions *arguments;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5885 Expression *arg;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5886 enum TOK endtok;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5887
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5888 arguments = new Expressions();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5889 if (token.value == TOKlbracket)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5890 endtok = TOKrbracket;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5891 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5892 endtok = TOKrparen;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5893
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5894 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5895 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5896 if (token.value != endtok)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5897 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5898 while (1)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5899 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5900 arg = parseAssignExp();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5901 arguments->push(arg);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5902 if (token.value == endtok)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5903 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5904 check(TOKcomma);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5905 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5906 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5907 check(endtok);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5908 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5909 return arguments;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5910 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5911
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5912 /*******************************************
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5913 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5914
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5915 Expression Parser::parseNewExp(Expression thisexp)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5916 { Type *t;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5917 Expressions *newargs;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5918 Expressions *arguments = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5919 Expression *e;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5920 Loc loc = this->loc;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5921
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5922 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5923 newargs = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5924 if (token.value == TOKlparen)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5925 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5926 newargs = parseArguments();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5927 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5928
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5929 // An anonymous nested class starts with "class"
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5930 if (token.value == TOKclass)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5931 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5932 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5933 if (token.value == TOKlparen)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5934 arguments = parseArguments();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5935
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5936 BaseClasses *baseclasses = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5937 if (token.value != TOKlcurly)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5938 baseclasses = parseBaseClasses();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5939
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5940 Identifier *id = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5941 ClassDeclaration *cd = new ClassDeclaration(loc, id, baseclasses);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5942
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5943 if (token.value != TOKlcurly)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5944 { error("{ members } expected for anonymous class");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5945 cd->members = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5946 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5947 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5948 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5949 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5950 Array *decl = parseDeclDefs(0);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5951 if (token.value != TOKrcurly)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5952 error("class member expected");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5953 nextToken();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5954 cd->members = decl;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5955 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5956
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5957 e = new NewAnonClassExp(loc, thisexp, newargs, cd, arguments);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5958
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5959 return e;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5960 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5961
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5962 t = parseBasicType();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5963 t = parseBasicType2(t);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5964 if (t->ty == Taarray)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5965 { TypeAArray taa = (TypeAArray )t;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5966 Type *index = taa->index;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5967
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5968 Expression *e = index->toExpression();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5969 if (e)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5970 { arguments = new Expressions();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5971 arguments->push(e);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5972 t = new TypeDArray(taa->next);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5973 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5974 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5975 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5976 error("need size of rightmost array, not type %s", index->toChars());
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5977 return new NullExp(loc);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5978 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5979 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5980 else if (t->ty == Tsarray)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5981 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5982 TypeSArray tsa = (TypeSArray )t;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5983 Expression *e = tsa->dim;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5984
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5985 arguments = new Expressions();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5986 arguments->push(e);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5987 t = new TypeDArray(tsa->next);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5988 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5989 else if (token.value == TOKlparen)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5990 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5991 arguments = parseArguments();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5992 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5993 e = new NewExp(loc, thisexp, newargs, t, arguments);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5994 return e;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5995 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5996
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5997 /**********************************************
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5998 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	5999
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	6000 void Parser::addComment(Dsymbol s, unsigned char blockComment)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	6001 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	6002 s->addComment(combineComments(blockComment, token.lineComment));
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	6003 token.lineComment = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	6004 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	6005
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	6006
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	6007 /******************************* *************************/
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: 847 diff changeset	6008

Mercurial > projects > ldc

annotate dmd2/parse.c @ 1650:40bd4a0d4870