projects/dang: parser/Parser.d annotate

annotate parser/Parser.d @ 51:c96cdcbdb9d6 new_gen

Rearranged some stuff, and renamed LLVMGen -> CodeGen

author	Anders Halager <halager@gmail.com>
date	Sat, 26 Apr 2008 15:54:54 +0200
parents	b6c1dc30ca4b
children	da551f90e03f

rev	line source
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	1 module parser.Parser;
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	2
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	3 import lexer.Lexer,
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	4 lexer.Token;
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	5
44 495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	6 import parser.Action;
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	7
21 0fb2d13dce37 Now working with gdc also (gdc use reverse paremeter validating on function calls) johnsen@johnsen-laptop parents: 12 diff changeset	8 import misc.Error;
0fb2d13dce37 Now working with gdc also (gdc use reverse paremeter validating on function calls) johnsen@johnsen-laptop parents: 12 diff changeset	9
44 495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	10 import basic.SmallArray;
495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	11
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	12 import tango.io.Stdout,
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	13 Integer = tango.text.convert.Integer;
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	14
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	15 class Parser
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	16 {
44 495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	17 Action action;
495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	18 alias Object Exp;
495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	19 alias Object Stmt;
495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	20 alias Object Decl;
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	21
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	22 public:
51 c96cdcbdb9d6 Rearranged some stuff, and renamed LLVMGen -> CodeGen Anders Halager <halager@gmail.com> parents: 48 diff changeset	23 Decl[] parse(Lexer lexer, Action act)
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	24 {
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	25 this.lexer = lexer;
51 c96cdcbdb9d6 Rearranged some stuff, and renamed LLVMGen -> CodeGen Anders Halager <halager@gmail.com> parents: 48 diff changeset	26 action = act;
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	27
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	28 Decl[] declarations;
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	29
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	30 while(lexer.peek.type != Tok.EOF)
48 b6c1dc30ca4b Only tests that dont pass now are structs and switches Anders Halager <halager@gmail.com> parents: 47 diff changeset	31 declarations ~= parseDecl();
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	32
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	33 return declarations;
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	34 }
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	35
48 b6c1dc30ca4b Only tests that dont pass now are structs and switches Anders Halager <halager@gmail.com> parents: 47 diff changeset	36 Decl parseDecl()
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	37 {
28 69464d465284 Now supporting structs - both read and write. Still a few errors though, so watch out. Anders Johnsen <skabet@gmail.com> parents: 22 diff changeset	38 Token t = lexer.peek;
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	39
44 495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	40 if (t.isBasicType \|\| t.isIdentifier)
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	41 {
44 495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	42 Id type = Id(lexer.next);
495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	43 Id iden = Id(require(Tok.Identifier));
495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	44 Token next = lexer.peek();
495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	45 if (next.type == Tok.Seperator)
495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	46 {
495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	47 Token sep = lexer.next();
495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	48 return action.actOnDeclarator(type, iden, null);
495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	49 }
495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	50 else if (next.type == Tok.Assign)
495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	51 {
495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	52 Token assign = lexer.next();
495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	53 Exp exp = parseExpression();
495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	54 require(Tok.Seperator);
495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	55 return action.actOnDeclarator(type, iden, exp);
495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	56 }
495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	57 else if (next.type == Tok.OpenParentheses)
495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	58 return parseFunc(type, iden);
495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	59 else
495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	60 throw error(__LINE__, PE.UnexpectedTok)
495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	61 .tok(next)
495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	62 .arg(next.getType);
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	63 }
44 495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	64 else if (t.type == Tok.Struct)
495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	65 {
495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	66 }
495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	67 char[] c = t.getType;
495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	68 throw error(__LINE__, PE.UnexpectedTok).tok(t).arg(c);
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	69 }
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	70
44 495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	71 /**
495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	72 Parse statements.
28 69464d465284 Now supporting structs - both read and write. Still a few errors though, so watch out. Anders Johnsen <skabet@gmail.com> parents: 22 diff changeset	73
44 495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	74 This is the place to attack!
495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	75 */
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	76 Stmt parseStatement()
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	77 {
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	78 Token t = lexer.peek;
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	79
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	80 switch(t.type)
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	81 {
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	82 case Tok.Return:
44 495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	83 Token ret = lexer.next;
46 90fb4fdfefdd While is back Anders Halager <halager@gmail.com> parents: 45 diff changeset	84 Exp exp;
90fb4fdfefdd While is back Anders Halager <halager@gmail.com> parents: 45 diff changeset	85 if (lexer.peek.type != Tok.Seperator)
90fb4fdfefdd While is back Anders Halager <halager@gmail.com> parents: 45 diff changeset	86 exp = parseExpression();
44 495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	87 require(Tok.Seperator);
495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	88 return action.actOnReturnStmt(ret, exp);
5 2c5a8f4c254a Added very simple if support. Anders Halager <halager@gmail.com> parents: 1 diff changeset	89
45 9bc660cbdbec If statements are back Anders Halager <halager@gmail.com> parents: 44 diff changeset	90 /*
9bc660cbdbec If statements are back Anders Halager <halager@gmail.com> parents: 44 diff changeset	91 if (cond)
9bc660cbdbec If statements are back Anders Halager <halager@gmail.com> parents: 44 diff changeset	92 single statement \| compound statement
9bc660cbdbec If statements are back Anders Halager <halager@gmail.com> parents: 44 diff changeset	93 [else
9bc660cbdbec If statements are back Anders Halager <halager@gmail.com> parents: 44 diff changeset	94 single statement \| compound statement]
9bc660cbdbec If statements are back Anders Halager <halager@gmail.com> parents: 44 diff changeset	95 */
5 2c5a8f4c254a Added very simple if support. Anders Halager <halager@gmail.com> parents: 1 diff changeset	96 case Tok.If:
45 9bc660cbdbec If statements are back Anders Halager <halager@gmail.com> parents: 44 diff changeset	97 Token _if = lexer.next();
9bc660cbdbec If statements are back Anders Halager <halager@gmail.com> parents: 44 diff changeset	98
9bc660cbdbec If statements are back Anders Halager <halager@gmail.com> parents: 44 diff changeset	99 require(Tok.OpenParentheses);
9bc660cbdbec If statements are back Anders Halager <halager@gmail.com> parents: 44 diff changeset	100 Exp cond = parseExpression();
9bc660cbdbec If statements are back Anders Halager <halager@gmail.com> parents: 44 diff changeset	101 require(Tok.CloseParentheses);
9bc660cbdbec If statements are back Anders Halager <halager@gmail.com> parents: 44 diff changeset	102
9bc660cbdbec If statements are back Anders Halager <halager@gmail.com> parents: 44 diff changeset	103 Stmt thenB = parseSingleOrCompoundStatement();
9bc660cbdbec If statements are back Anders Halager <halager@gmail.com> parents: 44 diff changeset	104
9bc660cbdbec If statements are back Anders Halager <halager@gmail.com> parents: 44 diff changeset	105 // if there is no else part we use the if as token, to have
9bc660cbdbec If statements are back Anders Halager <halager@gmail.com> parents: 44 diff changeset	106 // something than can be passed along
9bc660cbdbec If statements are back Anders Halager <halager@gmail.com> parents: 44 diff changeset	107 Token _else = _if;
9bc660cbdbec If statements are back Anders Halager <halager@gmail.com> parents: 44 diff changeset	108 Stmt elseB;
9bc660cbdbec If statements are back Anders Halager <halager@gmail.com> parents: 44 diff changeset	109 if (lexer.peek.type == Tok.Else)
9bc660cbdbec If statements are back Anders Halager <halager@gmail.com> parents: 44 diff changeset	110 {
9bc660cbdbec If statements are back Anders Halager <halager@gmail.com> parents: 44 diff changeset	111 _else = lexer.next;
9bc660cbdbec If statements are back Anders Halager <halager@gmail.com> parents: 44 diff changeset	112 elseB = parseSingleOrCompoundStatement();
9bc660cbdbec If statements are back Anders Halager <halager@gmail.com> parents: 44 diff changeset	113 }
9bc660cbdbec If statements are back Anders Halager <halager@gmail.com> parents: 44 diff changeset	114
9bc660cbdbec If statements are back Anders Halager <halager@gmail.com> parents: 44 diff changeset	115 return action.actOnIfStmt(_if, cond, thenB, _else, elseB);
5 2c5a8f4c254a Added very simple if support. Anders Halager <halager@gmail.com> parents: 1 diff changeset	116
47 b0a691727a0c Stricter while - the () was optional before Anders Halager <halager@gmail.com> parents: 46 diff changeset	117 /*
b0a691727a0c Stricter while - the () was optional before Anders Halager <halager@gmail.com> parents: 46 diff changeset	118 while (cond)
b0a691727a0c Stricter while - the () was optional before Anders Halager <halager@gmail.com> parents: 46 diff changeset	119 single statement \| compound statement
b0a691727a0c Stricter while - the () was optional before Anders Halager <halager@gmail.com> parents: 46 diff changeset	120 */
11 642c6a998fd9 Support for while statements and fixed scope for if Anders Halager <halager@gmail.com> parents: 10 diff changeset	121 case Tok.While:
46 90fb4fdfefdd While is back Anders Halager <halager@gmail.com> parents: 45 diff changeset	122 Token _while = lexer.next;
47 b0a691727a0c Stricter while - the () was optional before Anders Halager <halager@gmail.com> parents: 46 diff changeset	123 require(Tok.OpenParentheses);
46 90fb4fdfefdd While is back Anders Halager <halager@gmail.com> parents: 45 diff changeset	124 Exp cond = parseExpression();
47 b0a691727a0c Stricter while - the () was optional before Anders Halager <halager@gmail.com> parents: 46 diff changeset	125 require(Tok.CloseParentheses);
46 90fb4fdfefdd While is back Anders Halager <halager@gmail.com> parents: 45 diff changeset	126 Stmt bodyStmt = parseSingleOrCompoundStatement();
90fb4fdfefdd While is back Anders Halager <halager@gmail.com> parents: 45 diff changeset	127 return action.actOnWhileStmt(_while, cond, bodyStmt);
5 2c5a8f4c254a Added very simple if support. Anders Halager <halager@gmail.com> parents: 1 diff changeset	128
48 b6c1dc30ca4b Only tests that dont pass now are structs and switches Anders Halager <halager@gmail.com> parents: 47 diff changeset	129 /*
b6c1dc30ca4b Only tests that dont pass now are structs and switches Anders Halager <halager@gmail.com> parents: 47 diff changeset	130 One of four things:
b6c1dc30ca4b Only tests that dont pass now are structs and switches Anders Halager <halager@gmail.com> parents: 47 diff changeset	131 A declaration of a function/variable `type id ...`
b6c1dc30ca4b Only tests that dont pass now are structs and switches Anders Halager <halager@gmail.com> parents: 47 diff changeset	132 A direct assignment `id = exp;`
b6c1dc30ca4b Only tests that dont pass now are structs and switches Anders Halager <halager@gmail.com> parents: 47 diff changeset	133 An indirect assignment `id.id = exp`
b6c1dc30ca4b Only tests that dont pass now are structs and switches Anders Halager <halager@gmail.com> parents: 47 diff changeset	134 Some sort of free standing expression
b6c1dc30ca4b Only tests that dont pass now are structs and switches Anders Halager <halager@gmail.com> parents: 47 diff changeset	135
b6c1dc30ca4b Only tests that dont pass now are structs and switches Anders Halager <halager@gmail.com> parents: 47 diff changeset	136 The assignments should be handled as binary expressions?
b6c1dc30ca4b Only tests that dont pass now are structs and switches Anders Halager <halager@gmail.com> parents: 47 diff changeset	137 */
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	138 case Tok.Identifier:
48 b6c1dc30ca4b Only tests that dont pass now are structs and switches Anders Halager <halager@gmail.com> parents: 47 diff changeset	139 Token iden = lexer.peek;
b6c1dc30ca4b Only tests that dont pass now are structs and switches Anders Halager <halager@gmail.com> parents: 47 diff changeset	140 Token n = lexer.peek(1);
b6c1dc30ca4b Only tests that dont pass now are structs and switches Anders Halager <halager@gmail.com> parents: 47 diff changeset	141 // Must be an decl, if we start with a basic type, or two
b6c1dc30ca4b Only tests that dont pass now are structs and switches Anders Halager <halager@gmail.com> parents: 47 diff changeset	142 // identifiers in a row
b6c1dc30ca4b Only tests that dont pass now are structs and switches Anders Halager <halager@gmail.com> parents: 47 diff changeset	143 if (iden.isBasicType() \|\| n.isIdentifier())
b6c1dc30ca4b Only tests that dont pass now are structs and switches Anders Halager <halager@gmail.com> parents: 47 diff changeset	144 {
b6c1dc30ca4b Only tests that dont pass now are structs and switches Anders Halager <halager@gmail.com> parents: 47 diff changeset	145 // manually hardcoded to only support "type id [= exp];"
b6c1dc30ca4b Only tests that dont pass now are structs and switches Anders Halager <halager@gmail.com> parents: 47 diff changeset	146 // as that is the only thing the codegen understands
b6c1dc30ca4b Only tests that dont pass now are structs and switches Anders Halager <halager@gmail.com> parents: 47 diff changeset	147 Id type = Id(lexer.next);
b6c1dc30ca4b Only tests that dont pass now are structs and switches Anders Halager <halager@gmail.com> parents: 47 diff changeset	148 Id id = Id(lexer.next);
b6c1dc30ca4b Only tests that dont pass now are structs and switches Anders Halager <halager@gmail.com> parents: 47 diff changeset	149 Exp init;
b6c1dc30ca4b Only tests that dont pass now are structs and switches Anders Halager <halager@gmail.com> parents: 47 diff changeset	150 if (skip(Tok.Assign))
b6c1dc30ca4b Only tests that dont pass now are structs and switches Anders Halager <halager@gmail.com> parents: 47 diff changeset	151 init = parseExpression();
b6c1dc30ca4b Only tests that dont pass now are structs and switches Anders Halager <halager@gmail.com> parents: 47 diff changeset	152 require(Tok.Seperator);
b6c1dc30ca4b Only tests that dont pass now are structs and switches Anders Halager <halager@gmail.com> parents: 47 diff changeset	153 Decl d = action.actOnDeclarator(type, id, init);
b6c1dc30ca4b Only tests that dont pass now are structs and switches Anders Halager <halager@gmail.com> parents: 47 diff changeset	154 return action.actOnDeclStmt(d);
b6c1dc30ca4b Only tests that dont pass now are structs and switches Anders Halager <halager@gmail.com> parents: 47 diff changeset	155 }
b6c1dc30ca4b Only tests that dont pass now are structs and switches Anders Halager <halager@gmail.com> parents: 47 diff changeset	156 // Expression: a.b, a = b, a(b) etc.
b6c1dc30ca4b Only tests that dont pass now are structs and switches Anders Halager <halager@gmail.com> parents: 47 diff changeset	157 else
b6c1dc30ca4b Only tests that dont pass now are structs and switches Anders Halager <halager@gmail.com> parents: 47 diff changeset	158 {
b6c1dc30ca4b Only tests that dont pass now are structs and switches Anders Halager <halager@gmail.com> parents: 47 diff changeset	159 Exp exp = parseExpression();
b6c1dc30ca4b Only tests that dont pass now are structs and switches Anders Halager <halager@gmail.com> parents: 47 diff changeset	160 require(Tok.Seperator);
b6c1dc30ca4b Only tests that dont pass now are structs and switches Anders Halager <halager@gmail.com> parents: 47 diff changeset	161 return action.actOnExprStmt(exp);
b6c1dc30ca4b Only tests that dont pass now are structs and switches Anders Halager <halager@gmail.com> parents: 47 diff changeset	162 }
b6c1dc30ca4b Only tests that dont pass now are structs and switches Anders Halager <halager@gmail.com> parents: 47 diff changeset	163 break;
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	164
36 ce17bea8e9bd Switch statements support Anders Halager <halager@gmail.com> parents: 33 diff changeset	165 case Tok.Switch:
48 b6c1dc30ca4b Only tests that dont pass now are structs and switches Anders Halager <halager@gmail.com> parents: 47 diff changeset	166 throw error(__LINE__, ":(").tok(lexer.peek);
44 495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	167 return null;
36 ce17bea8e9bd Switch statements support Anders Halager <halager@gmail.com> parents: 33 diff changeset	168
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	169 default:
48 b6c1dc30ca4b Only tests that dont pass now are structs and switches Anders Halager <halager@gmail.com> parents: 47 diff changeset	170 if (t.isBasicType())
b6c1dc30ca4b Only tests that dont pass now are structs and switches Anders Halager <halager@gmail.com> parents: 47 diff changeset	171 goto case Tok.Identifier;
b6c1dc30ca4b Only tests that dont pass now are structs and switches Anders Halager <halager@gmail.com> parents: 47 diff changeset	172 throw error(__LINE__, ":(").tok(lexer.peek);
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	173 }
48 b6c1dc30ca4b Only tests that dont pass now are structs and switches Anders Halager <halager@gmail.com> parents: 47 diff changeset	174 throw error(__LINE__, "").tok(t);
44 495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	175 return null;
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	176 }
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	177
44 495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	178 /**
48 b6c1dc30ca4b Only tests that dont pass now are structs and switches Anders Halager <halager@gmail.com> parents: 47 diff changeset	179 Parses a function/method given the already parsed return type and name
44 495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	180 */
495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	181 Decl parseFunc(ref Id type, ref Id name)
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	182 {
44 495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	183 Decl func = action.actOnStartOfFunctionDef(type, name);
495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	184 parseFuncArgs(func);
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	185
44 495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	186 Stmt stmt = parseCompoundStatement();
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	187
48 b6c1dc30ca4b Only tests that dont pass now are structs and switches Anders Halager <halager@gmail.com> parents: 47 diff changeset	188 return action.actOnEndOfFunction(func, stmt);
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	189 }
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	190
44 495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	191 /**
495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	192 Parse the function arguments, assumes current token is (.
495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	193
495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	194 Both the intitial paren and the ending paren is consumed.
495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	195 */
495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	196 void parseFuncArgs(Decl func)
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	197 {
44 495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	198 require(Tok.OpenParentheses); // Remove the "(" token.
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	199
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	200 while(lexer.peek.type != Tok.CloseParentheses)
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	201 {
44 495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	202 auto t = parseType();
495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	203 auto i = parseIdentifier();
495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	204 action.addFuncArg(func, t, i);
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	205
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	206 if(lexer.peek.type == Tok.Comma)
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	207 lexer.next;
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	208 }
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	209
44 495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	210 require(Tok.CloseParentheses); // Remove the ")"
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	211 }
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	212
44 495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	213 /**
45 9bc660cbdbec If statements are back Anders Halager <halager@gmail.com> parents: 44 diff changeset	214 Parse either a block, or a single statement as allowed after if, while
9bc660cbdbec If statements are back Anders Halager <halager@gmail.com> parents: 44 diff changeset	215 and for.
9bc660cbdbec If statements are back Anders Halager <halager@gmail.com> parents: 44 diff changeset	216 */
9bc660cbdbec If statements are back Anders Halager <halager@gmail.com> parents: 44 diff changeset	217 Stmt parseSingleOrCompoundStatement()
9bc660cbdbec If statements are back Anders Halager <halager@gmail.com> parents: 44 diff changeset	218 {
9bc660cbdbec If statements are back Anders Halager <halager@gmail.com> parents: 44 diff changeset	219 if (lexer.peek.type == Tok.OpenBrace)
9bc660cbdbec If statements are back Anders Halager <halager@gmail.com> parents: 44 diff changeset	220 return parseCompoundStatement();
9bc660cbdbec If statements are back Anders Halager <halager@gmail.com> parents: 44 diff changeset	221 return parseStatement();
9bc660cbdbec If statements are back Anders Halager <halager@gmail.com> parents: 44 diff changeset	222 }
9bc660cbdbec If statements are back Anders Halager <halager@gmail.com> parents: 44 diff changeset	223 /**
44 495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	224 Parses a function-body or similar, expects { to be current token.
495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	225
495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	226 Will consume both the starting { and ending }
495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	227 */
495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	228 Stmt parseCompoundStatement()
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	229 {
44 495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	230 Token lbrace = require(Tok.OpenBrace);
495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	231 SmallArray!(Stmt, 32) stmts; // Try to use the stack only
495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	232 while (lexer.peek.type != Tok.CloseBrace)
495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	233 stmts ~= parseStatement();
495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	234 Token rbrace = require(Tok.CloseBrace);
495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	235 return action.actOnCompoundStmt(lbrace, rbrace, stmts.unsafe());
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	236 }
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	237
44 495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	238 Id parseIdentifier()
495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	239 {
495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	240 Token tok = lexer.next;
495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	241
495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	242 if (tok.type is Tok.Identifier)
495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	243 return Id(tok);
495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	244
495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	245 throw error(__LINE__, PE.UnexpectedTokSingle)
495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	246 .arg(tok.getType)
495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	247 .arg(Tok.Identifier)
495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	248 .tok(tok);
495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	249 }
495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	250
495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	251 Id parseType()
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	252 {
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	253 Token type = lexer.next;
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	254
44 495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	255 if (type.isBasicType \|\| type.type == Tok.Identifier)
495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	256 return Id(type);
495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	257
495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	258 char[] c = type.getType;
495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	259 error(__LINE__, "Unexpected token in Type parsing. Got %0").arg(c);
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	260 }
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	261
44 495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	262 private:
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	263 // -- Expression parsing -- //
28 69464d465284 Now supporting structs - both read and write. Still a few errors though, so watch out. Anders Johnsen <skabet@gmail.com> parents: 22 diff changeset	264 Exp parseExpIdentifier(Exp target)
69464d465284 Now supporting structs - both read and write. Still a few errors though, so watch out. Anders Johnsen <skabet@gmail.com> parents: 22 diff changeset	265 {
69464d465284 Now supporting structs - both read and write. Still a few errors though, so watch out. Anders Johnsen <skabet@gmail.com> parents: 22 diff changeset	266 switch(lexer.peek.type)
69464d465284 Now supporting structs - both read and write. Still a few errors though, so watch out. Anders Johnsen <skabet@gmail.com> parents: 22 diff changeset	267 {
69464d465284 Now supporting structs - both read and write. Still a few errors though, so watch out. Anders Johnsen <skabet@gmail.com> parents: 22 diff changeset	268 case Tok.Dot:
69464d465284 Now supporting structs - both read and write. Still a few errors though, so watch out. Anders Johnsen <skabet@gmail.com> parents: 22 diff changeset	269 switch(lexer.peek(1).type)
69464d465284 Now supporting structs - both read and write. Still a few errors though, so watch out. Anders Johnsen <skabet@gmail.com> parents: 22 diff changeset	270 {
69464d465284 Now supporting structs - both read and write. Still a few errors though, so watch out. Anders Johnsen <skabet@gmail.com> parents: 22 diff changeset	271 case Tok.Identifier:
44 495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	272 Token op = lexer.next;
495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	273 Id member = Id(lexer.next);
495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	274 Exp exp = action.actOnMemberReference(target, op.location, member);
495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	275 return parseExpIdentifier(exp);
28 69464d465284 Now supporting structs - both read and write. Still a few errors though, so watch out. Anders Johnsen <skabet@gmail.com> parents: 22 diff changeset	276 default:
30 3147a52d1247 Ooops.. should have compiled before commit.. now works again Anders Halager <halager@gmail.com> parents: 29 diff changeset	277 Token t = lexer.peek(1);
44 495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	278 throw error(__LINE__, "Expected identifier after '.'").tok(t);
28 69464d465284 Now supporting structs - both read and write. Still a few errors though, so watch out. Anders Johnsen <skabet@gmail.com> parents: 22 diff changeset	279 }
69464d465284 Now supporting structs - both read and write. Still a few errors though, so watch out. Anders Johnsen <skabet@gmail.com> parents: 22 diff changeset	280 default:
69464d465284 Now supporting structs - both read and write. Still a few errors though, so watch out. Anders Johnsen <skabet@gmail.com> parents: 22 diff changeset	281 return target;
69464d465284 Now supporting structs - both read and write. Still a few errors though, so watch out. Anders Johnsen <skabet@gmail.com> parents: 22 diff changeset	282 }
69464d465284 Now supporting structs - both read and write. Still a few errors though, so watch out. Anders Johnsen <skabet@gmail.com> parents: 22 diff changeset	283 }
69464d465284 Now supporting structs - both read and write. Still a few errors though, so watch out. Anders Johnsen <skabet@gmail.com> parents: 22 diff changeset	284
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	285 Exp parseExpression(int p = 0)
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	286 {
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	287 auto exp = P();
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	288 Token next = lexer.peek();
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	289 BinOp* op = null;
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	290 while ((op = binary(next.type)) != null && op.prec >= p)
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	291 {
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	292 lexer.next();
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	293 int q = op.leftAssoc? 1 + op.prec : op.prec;
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	294 auto exp2 = parseExpression(q);
44 495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	295 exp = action.actOnBinaryOp(op.operator, exp, exp2);
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	296 next = lexer.peek();
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	297 }
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	298
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	299 return exp;
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	300 }
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	301
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	302 Exp P()
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	303 {
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	304 Token next = lexer.next();
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	305 if (auto op = unary(next.type))
44 495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	306 return action.actOnUnaryOp(next, parseExpression(op.prec));
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	307 else if (next.type == Tok.OpenParentheses)
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	308 {
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	309 auto e = parseExpression(0);
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	310 require(Tok.CloseParentheses);
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	311 return e;
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	312 }
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	313 else if (next.type == Tok.Identifier)
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	314 {
44 495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	315 Exp value = action.actOnIdentifierExp(Id(next));
495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	316 Exp iden = parseExpIdentifier(value);
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	317 switch(lexer.peek.type)
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	318 {
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	319 case Tok.OpenParentheses:
48 b6c1dc30ca4b Only tests that dont pass now are structs and switches Anders Halager <halager@gmail.com> parents: 47 diff changeset	320 Token lp = lexer.next;
b6c1dc30ca4b Only tests that dont pass now are structs and switches Anders Halager <halager@gmail.com> parents: 47 diff changeset	321 SmallArray!(Exp, 8) args;
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	322 while(lexer.peek.type != Tok.CloseParentheses)
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	323 {
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	324 if(lexer.peek.type == Tok.Comma)
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	325 lexer.next;
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	326 args ~= parseExpression();
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	327 }
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	328
48 b6c1dc30ca4b Only tests that dont pass now are structs and switches Anders Halager <halager@gmail.com> parents: 47 diff changeset	329 Token rp = lexer.next();
b6c1dc30ca4b Only tests that dont pass now are structs and switches Anders Halager <halager@gmail.com> parents: 47 diff changeset	330 return action.actOnCallExpr(iden, lp, args.unsafe(), rp);
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	331
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	332 default:
28 69464d465284 Now supporting structs - both read and write. Still a few errors though, so watch out. Anders Johnsen <skabet@gmail.com> parents: 22 diff changeset	333 return iden;
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	334 }
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	335 }
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	336 else if (next.type == Tok.Integer)
44 495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	337 return action.actOnNumericConstant(next);
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	338
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	339 Stdout.formatln("{}", next.getType);
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	340 assert(0, "Should not happen");
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	341 }
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	342
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	343 struct UnOp
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	344 {
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	345 Tok tokenType;
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	346 int prec;
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	347 }
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	348
44 495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	349 static const UnOp[] _unary = [{Tok.Sub, 4}];
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	350 UnOp* unary(Tok t)
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	351 {
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	352 foreach (ref op; _unary)
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	353 if (op.tokenType == t)
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	354 return &op;
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	355 return null;
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	356 }
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	357
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	358 struct BinOp
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	359 {
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	360 Tok tokenType;
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	361 int prec;
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	362 bool leftAssoc;
44 495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	363 Operator operator;
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	364 }
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	365
44 495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	366 static const BinOp[] _binary =
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	367 [
48 b6c1dc30ca4b Only tests that dont pass now are structs and switches Anders Halager <halager@gmail.com> parents: 47 diff changeset	368 {Tok.Assign, 1, false, Operator.Assign},
b6c1dc30ca4b Only tests that dont pass now are structs and switches Anders Halager <halager@gmail.com> parents: 47 diff changeset	369
44 495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	370 {Tok.Eq, 2, true, Operator.Eq},
495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	371 {Tok.Ne, 2, true, Operator.Ne},
10 2f493057cf17 Some support for the rest of the boolean operators Anders Halager <halager@gmail.com> parents: 7 diff changeset	372
44 495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	373 {Tok.Lt, 2, true, Operator.Lt},
495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	374 {Tok.Le, 2, true, Operator.Le},
495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	375 {Tok.Gt, 2, true, Operator.Gt},
495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	376 {Tok.Ge, 2, true, Operator.Ge},
10 2f493057cf17 Some support for the rest of the boolean operators Anders Halager <halager@gmail.com> parents: 7 diff changeset	377
44 495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	378 {Tok.Add, 3, true, Operator.Add},
495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	379 {Tok.Sub, 3, true, Operator.Sub},
495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	380
495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	381 {Tok.Mul, 5, true, Operator.Mul},
495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	382 {Tok.Div, 5, true, Operator.Div}
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	383 ];
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	384 BinOp* binary(Tok t)
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	385 {
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	386 foreach (ref op; _binary)
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	387 if (op.tokenType == t)
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	388 return &op;
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	389 return null;
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	390 }
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	391
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	392 private:
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	393
36 ce17bea8e9bd Switch statements support Anders Halager <halager@gmail.com> parents: 33 diff changeset	394 Token require(Tok t)
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	395 {
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	396 if (lexer.peek().type != t)
44 495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	397 throw error(__LINE__, PE.UnexpectedTokSingle)
29 41d23f2762c3 Merge, and updated Error class Anders Halager <halager@gmail.com> parents: 28 diff changeset	398 .arg(lexer.peek.getType)
33 084c2c147c4f Improvements to the Error class. Anders Halager <halager@gmail.com> parents: 30 diff changeset	399 .arg(t);
36 ce17bea8e9bd Switch statements support Anders Halager <halager@gmail.com> parents: 33 diff changeset	400 return lexer.next();
ce17bea8e9bd Switch statements support Anders Halager <halager@gmail.com> parents: 33 diff changeset	401 }
ce17bea8e9bd Switch statements support Anders Halager <halager@gmail.com> parents: 33 diff changeset	402
ce17bea8e9bd Switch statements support Anders Halager <halager@gmail.com> parents: 33 diff changeset	403 bool skip(Tok t)
ce17bea8e9bd Switch statements support Anders Halager <halager@gmail.com> parents: 33 diff changeset	404 {
ce17bea8e9bd Switch statements support Anders Halager <halager@gmail.com> parents: 33 diff changeset	405 if (lexer.peek().type != t)
ce17bea8e9bd Switch statements support Anders Halager <halager@gmail.com> parents: 33 diff changeset	406 return false;
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	407 lexer.next();
36 ce17bea8e9bd Switch statements support Anders Halager <halager@gmail.com> parents: 33 diff changeset	408 return true;
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	409 }
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	410
44 495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	411 Error error(uint line, char[] errMsg)
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	412 {
44 495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	413 Location loc = lexer.peek.location;
33 084c2c147c4f Improvements to the Error class. Anders Halager <halager@gmail.com> parents: 30 diff changeset	414 auto e =
084c2c147c4f Improvements to the Error class. Anders Halager <halager@gmail.com> parents: 30 diff changeset	415 new Error("Parser.d(" ~ Integer.toString(line) ~ "): " ~errMsg);
084c2c147c4f Improvements to the Error class. Anders Halager <halager@gmail.com> parents: 30 diff changeset	416 e.loc(loc);
084c2c147c4f Improvements to the Error class. Anders Halager <halager@gmail.com> parents: 30 diff changeset	417 return e;
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	418 }
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	419
44 495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	420 struct PE
495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	421 {
495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	422 static char[]
495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	423 UnexpectedTokMulti = "Unexpected token, got %0 expected one of %1",
495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	424 UnexpectedTokSingle = "Unexpected token, got %0 expected %1",
495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	425 UnexpectedTok = "Unexpected token %0";
36 ce17bea8e9bd Switch statements support Anders Halager <halager@gmail.com> parents: 33 diff changeset	426
44 495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	427 static char[]
495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	428 CaseValueMustBeInt = "Cases can only be integer literals";
495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 37 diff changeset	429 }
33 084c2c147c4f Improvements to the Error class. Anders Halager <halager@gmail.com> parents: 30 diff changeset	430
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	431 Lexer lexer;
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	432 }

Mercurial > projects > dang

annotate parser/Parser.d @ 51:c96cdcbdb9d6 new_gen