annotate parser/Parser.d @ 37:858b9805843d new_gen

Bug-fixes Void can now be used and is recognized as a keyword by lexer Fixed a problem with casting on pointer types The expression is now optional for a ReturnStmt (only legal in void funcs)
author Anders Halager <halager@gmail.com>
date Sun, 20 Apr 2008 23:53:05 +0200
parents ce17bea8e9bd
children 495188f9078e
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
6 import ast.Exp,
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
7 ast.Stmt,
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
8 ast.Decl;
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
9
21
0fb2d13dce37 Now working with gdc also (gdc use reverse paremeter validating on function calls)
johnsen@johnsen-laptop
parents: 12
diff changeset
10 import misc.Error;
0fb2d13dce37 Now working with gdc also (gdc use reverse paremeter validating on function calls)
johnsen@johnsen-laptop
parents: 12
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 {
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
17
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
18 public:
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
19 Decl[] parse(Lexer lexer)
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
20 {
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
21 this.lexer = lexer;
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
22
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
23
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
24 Decl[] declarations;
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
25
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
26 while(lexer.peek.type != Tok.EOF)
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
27 {
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
28 declarations ~= parseRootDecl;
1
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
29 }
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
30
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
31 return declarations;
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
32 }
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
33
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
34 Decl parseRootDecl()
1
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
35 {
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
36 Token t = lexer.peek;
1
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
37
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
38 switch(t.type)
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
39 {
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
40 case Tok.Byte, Tok.Ubyte,
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
41 Tok.Short, Tok.Ushort,
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
42 Tok.Int, Tok.Uint,
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
43 Tok.Long, Tok.Ulong,
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
44 Tok.Float, Tok.Double,
12
6282db07115f Added some ekstra tests, and allowed bool as a type
Anders Halager <halager@gmail.com>
parents: 11
diff changeset
45 Tok.Bool,
37
858b9805843d Bug-fixes
Anders Halager <halager@gmail.com>
parents: 36
diff changeset
46 Tok.Void,
1
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
47 Tok.Identifier:
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
48 Identifier type = new Identifier(t);
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
49
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
50 Token iden = lexer.peek(1);
21
0fb2d13dce37 Now working with gdc also (gdc use reverse paremeter validating on function calls)
johnsen@johnsen-laptop
parents: 12
diff changeset
51
1
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
52 switch(iden.type)
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
53 {
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
54 case Tok.Identifier:
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
55 Identifier identifier = new Identifier(iden);
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
56 Token p = lexer.peek(2);
1
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
57 switch(p.type)
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
58 {
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
59 case Tok.OpenParentheses:
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
60 lexer.next; lexer.next;
1
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
61 return parseFunc(type, identifier);
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
62 case Tok.Seperator:
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
63 lexer.next; lexer.next;
1
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
64 require(Tok.Seperator);
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
65 return new VarDecl(type, identifier, null);
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
66 case Tok.Assign:
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
67 lexer.next; lexer.next;
1
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
68 lexer.next();
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
69 auto exp = parseExpression();
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
70 require(Tok.Seperator);
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
71 return new VarDecl(type, identifier, exp);
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
72 default:
33
084c2c147c4f Improvements to the Error class.
Anders Halager <halager@gmail.com>
parents: 30
diff changeset
73 char[] c = p.getType;
36
ce17bea8e9bd Switch statements support
Anders Halager <halager@gmail.com>
parents: 33
diff changeset
74 throw error(__LINE__, UnexpectedTokMulti)
33
084c2c147c4f Improvements to the Error class.
Anders Halager <halager@gmail.com>
parents: 30
diff changeset
75 .tok(p)
084c2c147c4f Improvements to the Error class.
Anders Halager <halager@gmail.com>
parents: 30
diff changeset
76 .arg(c)
084c2c147c4f Improvements to the Error class.
Anders Halager <halager@gmail.com>
parents: 30
diff changeset
77 .arg(Tok.OpenParentheses, Tok.Seperator, Tok.Assign);
1
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
78 }
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
79 break;
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
80 default:
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
81 char[] c = t.getType;
36
ce17bea8e9bd Switch statements support
Anders Halager <halager@gmail.com>
parents: 33
diff changeset
82 throw error(__LINE__, UnexpectedTok).tok(iden).arg(c);
1
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
83 }
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
84 break;
22
e331e4e816e4 now handling structs to some extend
johnsen@johnsen-laptop
parents: 21
diff changeset
85 case Tok.Struct:
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
86 lexer.next;
22
e331e4e816e4 now handling structs to some extend
johnsen@johnsen-laptop
parents: 21
diff changeset
87 Token iden = lexer.next;
e331e4e816e4 now handling structs to some extend
johnsen@johnsen-laptop
parents: 21
diff changeset
88 switch(iden.type)
e331e4e816e4 now handling structs to some extend
johnsen@johnsen-laptop
parents: 21
diff changeset
89 {
e331e4e816e4 now handling structs to some extend
johnsen@johnsen-laptop
parents: 21
diff changeset
90 case Tok.Identifier:
e331e4e816e4 now handling structs to some extend
johnsen@johnsen-laptop
parents: 21
diff changeset
91 Identifier identifier = new Identifier(iden);
e331e4e816e4 now handling structs to some extend
johnsen@johnsen-laptop
parents: 21
diff changeset
92 return new StructDecl (identifier, parseStruct());
e331e4e816e4 now handling structs to some extend
johnsen@johnsen-laptop
parents: 21
diff changeset
93 default:
29
41d23f2762c3 Merge, and updated Error class
Anders Halager <halager@gmail.com>
parents: 28
diff changeset
94 throw error(__LINE__, "Expected struct identifier, but got %0").arg(iden.getType);
22
e331e4e816e4 now handling structs to some extend
johnsen@johnsen-laptop
parents: 21
diff changeset
95 }
1
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
96 case Tok.EOF:
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
97 return null;
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
98 default:
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
99 char[] c = t.getType;
36
ce17bea8e9bd Switch statements support
Anders Halager <halager@gmail.com>
parents: 33
diff changeset
100 throw error(__LINE__, UnexpectedTok).tok(t).arg(c);
1
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
101 }
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
102 }
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
103
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
104 Decl parseDecl()
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
105 {
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
106 Token t = lexer.peek;
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
107
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
108 switch(t.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
109 {
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
110 case Tok.Byte, Tok.Ubyte,
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
111 Tok.Short, Tok.Ushort,
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
112 Tok.Int, Tok.Uint,
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
113 Tok.Long, Tok.Ulong,
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
114 Tok.Float, Tok.Double,
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
115 Tok.Bool,
37
858b9805843d Bug-fixes
Anders Halager <halager@gmail.com>
parents: 36
diff changeset
116 Tok.Void,
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
117 Tok.Identifier:
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
118 Identifier type = new Identifier(t);
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
119
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
120 Token iden = lexer.peek(1);
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
121
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
122 switch(iden.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
123 {
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
124 case Tok.Identifier:
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
125 Identifier identifier = new Identifier(iden);
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
126 Token p = lexer.peek(2);
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
127 switch(p.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
128 {
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
129 case Tok.OpenParentheses:
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
130 lexer.next; lexer.next;
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
131 return parseFunc(type, identifier);
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
132 case Tok.Seperator:
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
133 lexer.next; lexer.next;
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
134 require(Tok.Seperator);
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
135 return new VarDecl(type, identifier, null);
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
136 case Tok.Assign:
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
137 lexer.next; lexer.next;
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
138 lexer.next();
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
139 auto exp = parseExpression();
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
140 require(Tok.Seperator);
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
141 return new VarDecl(type, identifier, exp);
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
142 default:
33
084c2c147c4f Improvements to the Error class.
Anders Halager <halager@gmail.com>
parents: 30
diff changeset
143 char[] c = p.getType;
36
ce17bea8e9bd Switch statements support
Anders Halager <halager@gmail.com>
parents: 33
diff changeset
144 throw error(__LINE__, UnexpectedTokMulti)
33
084c2c147c4f Improvements to the Error class.
Anders Halager <halager@gmail.com>
parents: 30
diff changeset
145 .tok(p)
084c2c147c4f Improvements to the Error class.
Anders Halager <halager@gmail.com>
parents: 30
diff changeset
146 .arg(c)
084c2c147c4f Improvements to the Error class.
Anders Halager <halager@gmail.com>
parents: 30
diff changeset
147 .arg(Tok.OpenParentheses, Tok.Seperator, Tok.Assign);
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
148 }
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
149 break;
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
150 default:
33
084c2c147c4f Improvements to the Error class.
Anders Halager <halager@gmail.com>
parents: 30
diff changeset
151 char[] c = iden.getType;
36
ce17bea8e9bd Switch statements support
Anders Halager <halager@gmail.com>
parents: 33
diff changeset
152 throw error(__LINE__, UnexpectedTokSingle)
33
084c2c147c4f Improvements to the Error class.
Anders Halager <halager@gmail.com>
parents: 30
diff changeset
153 .tok(iden)
084c2c147c4f Improvements to the Error class.
Anders Halager <halager@gmail.com>
parents: 30
diff changeset
154 .arg(c)
084c2c147c4f Improvements to the Error class.
Anders Halager <halager@gmail.com>
parents: 30
diff changeset
155 .arg(Tok.Identifier);
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
156 }
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
157 break;
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
158 case Tok.EOF:
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
159 return null;
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
160 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
161 char[] c = t.getType;
36
ce17bea8e9bd Switch statements support
Anders Halager <halager@gmail.com>
parents: 33
diff changeset
162 throw error(__LINE__, UnexpectedTok).arg(c);
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
163 }
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
164 }
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
165
22
e331e4e816e4 now handling structs to some extend
johnsen@johnsen-laptop
parents: 21
diff changeset
166 VarDecl[] parseStruct()
e331e4e816e4 now handling structs to some extend
johnsen@johnsen-laptop
parents: 21
diff changeset
167 {
e331e4e816e4 now handling structs to some extend
johnsen@johnsen-laptop
parents: 21
diff changeset
168 VarDecl[] varDecls;
e331e4e816e4 now handling structs to some extend
johnsen@johnsen-laptop
parents: 21
diff changeset
169 require(Tok.OpenBrace);
e331e4e816e4 now handling structs to some extend
johnsen@johnsen-laptop
parents: 21
diff changeset
170 while(lexer.peek.type != Tok.CloseBrace)
e331e4e816e4 now handling structs to some extend
johnsen@johnsen-laptop
parents: 21
diff changeset
171 {
e331e4e816e4 now handling structs to some extend
johnsen@johnsen-laptop
parents: 21
diff changeset
172 varDecls ~= cast(VarDecl)parseDecl;
e331e4e816e4 now handling structs to some extend
johnsen@johnsen-laptop
parents: 21
diff changeset
173 }
e331e4e816e4 now handling structs to some extend
johnsen@johnsen-laptop
parents: 21
diff changeset
174
e331e4e816e4 now handling structs to some extend
johnsen@johnsen-laptop
parents: 21
diff changeset
175 require(Tok.CloseBrace);
e331e4e816e4 now handling structs to some extend
johnsen@johnsen-laptop
parents: 21
diff changeset
176 return varDecls;
e331e4e816e4 now handling structs to some extend
johnsen@johnsen-laptop
parents: 21
diff changeset
177 }
e331e4e816e4 now handling structs to some extend
johnsen@johnsen-laptop
parents: 21
diff changeset
178
1
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
179 Stmt parseStatement()
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
180 {
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
181 Token t = lexer.peek;
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
182
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
183 switch(t.type)
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
184 {
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
185 case Tok.Return:
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
186 lexer.next;
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
187 auto ret = new ReturnStmt();
37
858b9805843d Bug-fixes
Anders Halager <halager@gmail.com>
parents: 36
diff changeset
188 if (!skip(Tok.Seperator))
858b9805843d Bug-fixes
Anders Halager <halager@gmail.com>
parents: 36
diff changeset
189 {
858b9805843d Bug-fixes
Anders Halager <halager@gmail.com>
parents: 36
diff changeset
190 ret.exp = parseExpression();
858b9805843d Bug-fixes
Anders Halager <halager@gmail.com>
parents: 36
diff changeset
191 require(Tok.Seperator);
858b9805843d Bug-fixes
Anders Halager <halager@gmail.com>
parents: 36
diff changeset
192 }
1
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
193 return ret;
5
2c5a8f4c254a Added very simple if support.
Anders Halager <halager@gmail.com>
parents: 1
diff changeset
194
2c5a8f4c254a Added very simple if support.
Anders Halager <halager@gmail.com>
parents: 1
diff changeset
195 case Tok.If:
2c5a8f4c254a Added very simple if support.
Anders Halager <halager@gmail.com>
parents: 1
diff changeset
196 lexer.next;
2c5a8f4c254a Added very simple if support.
Anders Halager <halager@gmail.com>
parents: 1
diff changeset
197 require(Tok.OpenParentheses);
2c5a8f4c254a Added very simple if support.
Anders Halager <halager@gmail.com>
parents: 1
diff changeset
198 auto condition = parseExpression();
2c5a8f4c254a Added very simple if support.
Anders Halager <halager@gmail.com>
parents: 1
diff changeset
199 require(Tok.CloseParentheses);
2c5a8f4c254a Added very simple if support.
Anders Halager <halager@gmail.com>
parents: 1
diff changeset
200
11
642c6a998fd9 Support for while statements and fixed scope for if
Anders Halager <halager@gmail.com>
parents: 10
diff changeset
201 auto then_body = parseBlockOrSingleStmt();
642c6a998fd9 Support for while statements and fixed scope for if
Anders Halager <halager@gmail.com>
parents: 10
diff changeset
202
642c6a998fd9 Support for while statements and fixed scope for if
Anders Halager <halager@gmail.com>
parents: 10
diff changeset
203 Stmt[] else_body;
642c6a998fd9 Support for while statements and fixed scope for if
Anders Halager <halager@gmail.com>
parents: 10
diff changeset
204 if (lexer.peek.type == Tok.Else)
5
2c5a8f4c254a Added very simple if support.
Anders Halager <halager@gmail.com>
parents: 1
diff changeset
205 {
2c5a8f4c254a Added very simple if support.
Anders Halager <halager@gmail.com>
parents: 1
diff changeset
206 lexer.next;
11
642c6a998fd9 Support for while statements and fixed scope for if
Anders Halager <halager@gmail.com>
parents: 10
diff changeset
207 else_body = parseBlockOrSingleStmt();
5
2c5a8f4c254a Added very simple if support.
Anders Halager <halager@gmail.com>
parents: 1
diff changeset
208 }
11
642c6a998fd9 Support for while statements and fixed scope for if
Anders Halager <halager@gmail.com>
parents: 10
diff changeset
209
642c6a998fd9 Support for while statements and fixed scope for if
Anders Halager <halager@gmail.com>
parents: 10
diff changeset
210 return new IfStmt(condition, then_body, else_body);
5
2c5a8f4c254a Added very simple if support.
Anders Halager <halager@gmail.com>
parents: 1
diff changeset
211
11
642c6a998fd9 Support for while statements and fixed scope for if
Anders Halager <halager@gmail.com>
parents: 10
diff changeset
212 case Tok.While:
642c6a998fd9 Support for while statements and fixed scope for if
Anders Halager <halager@gmail.com>
parents: 10
diff changeset
213 lexer.next;
642c6a998fd9 Support for while statements and fixed scope for if
Anders Halager <halager@gmail.com>
parents: 10
diff changeset
214 require(Tok.OpenParentheses);
642c6a998fd9 Support for while statements and fixed scope for if
Anders Halager <halager@gmail.com>
parents: 10
diff changeset
215 auto condition = parseExpression();
642c6a998fd9 Support for while statements and fixed scope for if
Anders Halager <halager@gmail.com>
parents: 10
diff changeset
216 require(Tok.CloseParentheses);
642c6a998fd9 Support for while statements and fixed scope for if
Anders Halager <halager@gmail.com>
parents: 10
diff changeset
217 return new WhileStmt(condition, parseBlockOrSingleStmt());
5
2c5a8f4c254a Added very simple if support.
Anders Halager <halager@gmail.com>
parents: 1
diff changeset
218
1
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
219 case Tok.Identifier:
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
220 Token n = lexer.peek(1);
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
221 switch(n.type)
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
222 {
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
223 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
224 Exp iden = parseExpIdentifier(new Identifier(lexer.next));
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
225 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
226 {
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
227 case Tok.Assign:
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
228 lexer.next;
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
229 auto stmt = new ExpStmt(new AssignExp(iden , parseExpression()));
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
230 require(Tok.Seperator);
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
231 return stmt;
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
232 break;
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
233 }
1
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
234 case Tok.Assign:
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
235 lexer.next;
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
236 lexer.next;
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
237 auto stmt = new ExpStmt(new AssignExp(new Identifier(t), parseExpression()));
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
238 require(Tok.Seperator);
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
239 return stmt;
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
240 break;
22
e331e4e816e4 now handling structs to some extend
johnsen@johnsen-laptop
parents: 21
diff changeset
241 case Tok.Identifier:
e331e4e816e4 now handling structs to some extend
johnsen@johnsen-laptop
parents: 21
diff changeset
242 auto decl = new DeclStmt(parseDecl());
e331e4e816e4 now handling structs to some extend
johnsen@johnsen-laptop
parents: 21
diff changeset
243 return decl;
1
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
244
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
245 default:
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
246 auto e = new ExpStmt(parseExpression());
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
247 require(Tok.Seperator);
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
248 return e;
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
249
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
250 }
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
251 break;
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
252
36
ce17bea8e9bd Switch statements support
Anders Halager <halager@gmail.com>
parents: 33
diff changeset
253 case Tok.Switch:
ce17bea8e9bd Switch statements support
Anders Halager <halager@gmail.com>
parents: 33
diff changeset
254 lexer.next;
ce17bea8e9bd Switch statements support
Anders Halager <halager@gmail.com>
parents: 33
diff changeset
255 require(Tok.OpenParentheses);
ce17bea8e9bd Switch statements support
Anders Halager <halager@gmail.com>
parents: 33
diff changeset
256 auto target = parseExpression();
ce17bea8e9bd Switch statements support
Anders Halager <halager@gmail.com>
parents: 33
diff changeset
257 auto res = new SwitchStmt(target);
ce17bea8e9bd Switch statements support
Anders Halager <halager@gmail.com>
parents: 33
diff changeset
258 require(Tok.CloseParentheses);
ce17bea8e9bd Switch statements support
Anders Halager <halager@gmail.com>
parents: 33
diff changeset
259 require(Tok.OpenBrace);
ce17bea8e9bd Switch statements support
Anders Halager <halager@gmail.com>
parents: 33
diff changeset
260 while (true)
ce17bea8e9bd Switch statements support
Anders Halager <halager@gmail.com>
parents: 33
diff changeset
261 {
ce17bea8e9bd Switch statements support
Anders Halager <halager@gmail.com>
parents: 33
diff changeset
262 Stmt[] statements;
ce17bea8e9bd Switch statements support
Anders Halager <halager@gmail.com>
parents: 33
diff changeset
263 if (skip(Tok.Default))
ce17bea8e9bd Switch statements support
Anders Halager <halager@gmail.com>
parents: 33
diff changeset
264 {
ce17bea8e9bd Switch statements support
Anders Halager <halager@gmail.com>
parents: 33
diff changeset
265 require(Tok.Colon);
ce17bea8e9bd Switch statements support
Anders Halager <halager@gmail.com>
parents: 33
diff changeset
266 statements.length = 0;
ce17bea8e9bd Switch statements support
Anders Halager <halager@gmail.com>
parents: 33
diff changeset
267 while (lexer.peek.type != Tok.Case
ce17bea8e9bd Switch statements support
Anders Halager <halager@gmail.com>
parents: 33
diff changeset
268 && lexer.peek.type != Tok.Default
ce17bea8e9bd Switch statements support
Anders Halager <halager@gmail.com>
parents: 33
diff changeset
269 && lexer.peek.type != Tok.CloseBrace)
ce17bea8e9bd Switch statements support
Anders Halager <halager@gmail.com>
parents: 33
diff changeset
270 statements ~= parseStatement();
ce17bea8e9bd Switch statements support
Anders Halager <halager@gmail.com>
parents: 33
diff changeset
271 res.setDefault(statements);
ce17bea8e9bd Switch statements support
Anders Halager <halager@gmail.com>
parents: 33
diff changeset
272 continue;
ce17bea8e9bd Switch statements support
Anders Halager <halager@gmail.com>
parents: 33
diff changeset
273 }
ce17bea8e9bd Switch statements support
Anders Halager <halager@gmail.com>
parents: 33
diff changeset
274
37
858b9805843d Bug-fixes
Anders Halager <halager@gmail.com>
parents: 36
diff changeset
275 Token _case = lexer.peek;
858b9805843d Bug-fixes
Anders Halager <halager@gmail.com>
parents: 36
diff changeset
276 if (_case.type != Tok.Case)
858b9805843d Bug-fixes
Anders Halager <halager@gmail.com>
parents: 36
diff changeset
277 break;
858b9805843d Bug-fixes
Anders Halager <halager@gmail.com>
parents: 36
diff changeset
278 lexer.next();
36
ce17bea8e9bd Switch statements support
Anders Halager <halager@gmail.com>
parents: 33
diff changeset
279
ce17bea8e9bd Switch statements support
Anders Halager <halager@gmail.com>
parents: 33
diff changeset
280 IntegerLit[] literals;
ce17bea8e9bd Switch statements support
Anders Halager <halager@gmail.com>
parents: 33
diff changeset
281 do
ce17bea8e9bd Switch statements support
Anders Halager <halager@gmail.com>
parents: 33
diff changeset
282 {
ce17bea8e9bd Switch statements support
Anders Halager <halager@gmail.com>
parents: 33
diff changeset
283 Exp e = parseExpression();
ce17bea8e9bd Switch statements support
Anders Halager <halager@gmail.com>
parents: 33
diff changeset
284 IntegerLit lit = cast(IntegerLit)e;
ce17bea8e9bd Switch statements support
Anders Halager <halager@gmail.com>
parents: 33
diff changeset
285 if (lit is null)
ce17bea8e9bd Switch statements support
Anders Halager <halager@gmail.com>
parents: 33
diff changeset
286 throw error(__LINE__, CaseValueMustBeInt)
ce17bea8e9bd Switch statements support
Anders Halager <halager@gmail.com>
parents: 33
diff changeset
287 .tok(_case);
ce17bea8e9bd Switch statements support
Anders Halager <halager@gmail.com>
parents: 33
diff changeset
288
ce17bea8e9bd Switch statements support
Anders Halager <halager@gmail.com>
parents: 33
diff changeset
289 literals ~= lit;
ce17bea8e9bd Switch statements support
Anders Halager <halager@gmail.com>
parents: 33
diff changeset
290 }
ce17bea8e9bd Switch statements support
Anders Halager <halager@gmail.com>
parents: 33
diff changeset
291 while (skip(Tok.Comma));
ce17bea8e9bd Switch statements support
Anders Halager <halager@gmail.com>
parents: 33
diff changeset
292 require(Tok.Colon);
ce17bea8e9bd Switch statements support
Anders Halager <halager@gmail.com>
parents: 33
diff changeset
293
ce17bea8e9bd Switch statements support
Anders Halager <halager@gmail.com>
parents: 33
diff changeset
294 while (lexer.peek.type != Tok.Case
ce17bea8e9bd Switch statements support
Anders Halager <halager@gmail.com>
parents: 33
diff changeset
295 && lexer.peek.type != Tok.Default
ce17bea8e9bd Switch statements support
Anders Halager <halager@gmail.com>
parents: 33
diff changeset
296 && lexer.peek.type != Tok.CloseBrace)
ce17bea8e9bd Switch statements support
Anders Halager <halager@gmail.com>
parents: 33
diff changeset
297 statements ~= parseStatement();
ce17bea8e9bd Switch statements support
Anders Halager <halager@gmail.com>
parents: 33
diff changeset
298
ce17bea8e9bd Switch statements support
Anders Halager <halager@gmail.com>
parents: 33
diff changeset
299 res.addCase(literals, statements);
ce17bea8e9bd Switch statements support
Anders Halager <halager@gmail.com>
parents: 33
diff changeset
300
ce17bea8e9bd Switch statements support
Anders Halager <halager@gmail.com>
parents: 33
diff changeset
301 if (lexer.peek.type == Tok.CloseBrace)
ce17bea8e9bd Switch statements support
Anders Halager <halager@gmail.com>
parents: 33
diff changeset
302 break;
ce17bea8e9bd Switch statements support
Anders Halager <halager@gmail.com>
parents: 33
diff changeset
303 }
ce17bea8e9bd Switch statements support
Anders Halager <halager@gmail.com>
parents: 33
diff changeset
304 require(Tok.CloseBrace);
ce17bea8e9bd Switch statements support
Anders Halager <halager@gmail.com>
parents: 33
diff changeset
305 return res;
ce17bea8e9bd Switch statements support
Anders Halager <halager@gmail.com>
parents: 33
diff changeset
306
1
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
307 default:
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
308 auto decl = new DeclStmt(parseDecl());
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
309 //require(Tok.Seperator);
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
310 return decl;
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
311 }
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
312 return new Stmt();
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
313 }
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
314
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
315 FuncDecl parseFunc(Identifier type, Identifier identifier)
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
316 {
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
317 VarDecl[] funcArgs = parseFuncArgs();
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
318
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
319 lexer.next; // Remove the "{"
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
320
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
321 Stmt[] statements;
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
322
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
323 while(lexer.peek.type != Tok.CloseBrace)
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
324 statements ~= parseStatement();
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
325
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
326 lexer.next; // Remove "}"
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
327
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
328 return new FuncDecl(type, identifier, funcArgs, statements);
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
329 }
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
330
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
331 VarDecl[] parseFuncArgs()
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
332 {
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
333 lexer.next; // Remove the "(" token.
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
334
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
335 VarDecl[] funcArgs;
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
336
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
337 while(lexer.peek.type != Tok.CloseParentheses)
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
338 {
21
0fb2d13dce37 Now working with gdc also (gdc use reverse paremeter validating on function calls)
johnsen@johnsen-laptop
parents: 12
diff changeset
339 auto t = parseType;
0fb2d13dce37 Now working with gdc also (gdc use reverse paremeter validating on function calls)
johnsen@johnsen-laptop
parents: 12
diff changeset
340 auto i = parseIdentifier;
0fb2d13dce37 Now working with gdc also (gdc use reverse paremeter validating on function calls)
johnsen@johnsen-laptop
parents: 12
diff changeset
341 funcArgs ~= new VarDecl(t, i);
1
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
342
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
343 if(lexer.peek.type == Tok.Comma)
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
344 lexer.next;
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
345 }
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
346
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
347 lexer.next; // Remove the ")"
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
348
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
349 return funcArgs;
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
350 }
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
351
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
352 Identifier parseIdentifier()
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
353 {
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
354 Token identifier = lexer.next;
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
355
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
356 switch(identifier.type)
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
357 {
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
358 case Tok.Identifier:
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
359 return new Identifier(identifier);
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
360 break;
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
361 default:
36
ce17bea8e9bd Switch statements support
Anders Halager <halager@gmail.com>
parents: 33
diff changeset
362 throw error(__LINE__, "Unexpected token in Identifier parsing. Got %0")
29
41d23f2762c3 Merge, and updated Error class
Anders Halager <halager@gmail.com>
parents: 28
diff changeset
363 .arg(identifier.getType)
33
084c2c147c4f Improvements to the Error class.
Anders Halager <halager@gmail.com>
parents: 30
diff changeset
364 .tok(identifier);
1
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
365 }
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
366 }
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
367
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
368 Identifier parseType()
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
369 {
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
370 Token type = lexer.next;
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
371
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
372 switch(type.type)
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
373 {
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
374 case Tok.Byte, Tok.Ubyte,
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
375 Tok.Short, Tok.Ushort,
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
376 Tok.Int, Tok.Uint,
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
377 Tok.Long, Tok.Ulong,
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
378 Tok.Float, Tok.Double,
12
6282db07115f Added some ekstra tests, and allowed bool as a type
Anders Halager <halager@gmail.com>
parents: 11
diff changeset
379 Tok.Bool,
37
858b9805843d Bug-fixes
Anders Halager <halager@gmail.com>
parents: 36
diff changeset
380 Tok.Void,
1
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
381 Tok.Identifier:
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
382 return new Identifier(type);
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
383 break;
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
384 default:
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
385 char[] c = type.getType;
36
ce17bea8e9bd Switch statements support
Anders Halager <halager@gmail.com>
parents: 33
diff changeset
386 error(__LINE__, "Unexpected token in Type parsing. Got %0").arg(c);
1
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
387 }
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
388 }
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
389
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
390 // -- Expression parsing -- //
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
391 private:
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
392 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
393 {
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
394 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
395 {
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
396 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
397 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
398 {
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
399 case Tok.Identifier:
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
400 lexer.next;
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
401 return parseExpIdentifier(
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
402 new MemberLookup(target, new Identifier(lexer.next)));
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
403 default:
30
3147a52d1247 Ooops.. should have compiled before commit.. now works again
Anders Halager <halager@gmail.com>
parents: 29
diff changeset
404 Token t = lexer.peek(1);
3147a52d1247 Ooops.. should have compiled before commit.. now works again
Anders Halager <halager@gmail.com>
parents: 29
diff changeset
405 throw error(__LINE__, "Expected identifier after '.'", &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
406 }
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
407 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
408 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
409 }
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
410 }
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
411
1
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
412 Exp parseExpression(int p = 0)
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
413 {
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
414 auto exp = P();
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
415 Token next = lexer.peek();
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
416 BinOp* op = null;
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
417 while ((op = binary(next.type)) != null && op.prec >= p)
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
418 {
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
419 lexer.next();
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
420 int q = op.leftAssoc? 1 + op.prec : op.prec;
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
421 auto exp2 = parseExpression(q);
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
422 exp = new BinaryExp(op.operator, exp, exp2);
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
423 next = lexer.peek();
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
424 }
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
425
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
426 return exp;
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
427 }
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
428
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
429 Exp P()
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
430 {
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
431 Token next = lexer.next();
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
432 if (auto op = unary(next.type))
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
433 return new NegateExp(parseExpression(op.prec));
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
434 else if (next.type == Tok.OpenParentheses)
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
435 {
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
436 auto e = parseExpression(0);
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
437 require(Tok.CloseParentheses);
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
438 return e;
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
439 }
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
440 else if (next.type == Tok.Identifier)
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
441 {
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
442 Exp iden = parseExpIdentifier(new Identifier(next));
1
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
443 switch(lexer.peek.type)
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
444 {
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
445 case Tok.OpenParentheses:
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
446 lexer.next;
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
447 Exp[] args;
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
448 while(lexer.peek.type != Tok.CloseParentheses)
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
449 {
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
450 if(lexer.peek.type == Tok.Comma)
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
451 {
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
452 lexer.next;
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
453 }
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
454 args ~= parseExpression();
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
455 }
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
456
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
457 lexer.next();
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
458 return new CallExp(iden, args);
1
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
459
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
460 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
461 return iden;
1
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
462 }
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
463 }
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
464 else if (next.type == Tok.Integer)
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
465 return new IntegerLit(next);
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
466
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
467 Stdout.formatln("{}", next.getType);
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
468 assert(0, "Should not happen");
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
469 }
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
470
11
642c6a998fd9 Support for while statements and fixed scope for if
Anders Halager <halager@gmail.com>
parents: 10
diff changeset
471 private Stmt[] parseBlockOrSingleStmt()
642c6a998fd9 Support for while statements and fixed scope for if
Anders Halager <halager@gmail.com>
parents: 10
diff changeset
472 {
642c6a998fd9 Support for while statements and fixed scope for if
Anders Halager <halager@gmail.com>
parents: 10
diff changeset
473 Stmt[] stmts;
642c6a998fd9 Support for while statements and fixed scope for if
Anders Halager <halager@gmail.com>
parents: 10
diff changeset
474 if (lexer.peek.type == Tok.OpenBrace)
642c6a998fd9 Support for while statements and fixed scope for if
Anders Halager <halager@gmail.com>
parents: 10
diff changeset
475 {
642c6a998fd9 Support for while statements and fixed scope for if
Anders Halager <halager@gmail.com>
parents: 10
diff changeset
476 lexer.next;
642c6a998fd9 Support for while statements and fixed scope for if
Anders Halager <halager@gmail.com>
parents: 10
diff changeset
477 while(lexer.peek.type != Tok.CloseBrace)
642c6a998fd9 Support for while statements and fixed scope for if
Anders Halager <halager@gmail.com>
parents: 10
diff changeset
478 stmts ~= parseStatement();
642c6a998fd9 Support for while statements and fixed scope for if
Anders Halager <halager@gmail.com>
parents: 10
diff changeset
479 lexer.next;
642c6a998fd9 Support for while statements and fixed scope for if
Anders Halager <halager@gmail.com>
parents: 10
diff changeset
480 }
642c6a998fd9 Support for while statements and fixed scope for if
Anders Halager <halager@gmail.com>
parents: 10
diff changeset
481 else
642c6a998fd9 Support for while statements and fixed scope for if
Anders Halager <halager@gmail.com>
parents: 10
diff changeset
482 stmts ~= parseStatement();
642c6a998fd9 Support for while statements and fixed scope for if
Anders Halager <halager@gmail.com>
parents: 10
diff changeset
483
642c6a998fd9 Support for while statements and fixed scope for if
Anders Halager <halager@gmail.com>
parents: 10
diff changeset
484 return stmts;
642c6a998fd9 Support for while statements and fixed scope for if
Anders Halager <halager@gmail.com>
parents: 10
diff changeset
485 }
642c6a998fd9 Support for while statements and fixed scope for if
Anders Halager <halager@gmail.com>
parents: 10
diff changeset
486
1
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
487 struct UnOp
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
488 {
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
489 Tok tokenType;
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
490 int prec;
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
491 }
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
492
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
493 static UnOp[] _unary = [{Tok.Sub, 4}];
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
494 UnOp* unary(Tok t)
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
495 {
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
496 foreach (ref op; _unary)
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
497 if (op.tokenType == t)
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
498 return &op;
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
499 return null;
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
500 }
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
501
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
502 struct BinOp
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
503 {
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
504 Tok tokenType;
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
505 int prec;
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
506 bool leftAssoc;
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
507 BinaryExp.Operator operator;
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
508 }
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
509
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
510 static BinOp[] _binary =
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
511 [
10
2f493057cf17 Some support for the rest of the boolean operators
Anders Halager <halager@gmail.com>
parents: 7
diff changeset
512 {Tok.Eq, 2, true, BinaryExp.Operator.Eq},
2f493057cf17 Some support for the rest of the boolean operators
Anders Halager <halager@gmail.com>
parents: 7
diff changeset
513 {Tok.Ne, 2, true, BinaryExp.Operator.Ne},
2f493057cf17 Some support for the rest of the boolean operators
Anders Halager <halager@gmail.com>
parents: 7
diff changeset
514 {Tok.Lt, 2, true, BinaryExp.Operator.Lt},
2f493057cf17 Some support for the rest of the boolean operators
Anders Halager <halager@gmail.com>
parents: 7
diff changeset
515 {Tok.Le, 2, true, BinaryExp.Operator.Le},
2f493057cf17 Some support for the rest of the boolean operators
Anders Halager <halager@gmail.com>
parents: 7
diff changeset
516 {Tok.Gt, 2, true, BinaryExp.Operator.Gt},
2f493057cf17 Some support for the rest of the boolean operators
Anders Halager <halager@gmail.com>
parents: 7
diff changeset
517 {Tok.Ge, 2, true, BinaryExp.Operator.Ge},
2f493057cf17 Some support for the rest of the boolean operators
Anders Halager <halager@gmail.com>
parents: 7
diff changeset
518
7
2ce5209f1954 Starting to work on bool support, for now == works
Anders Halager <halager@gmail.com>
parents: 5
diff changeset
519 {Tok.Add, 3, true, BinaryExp.Operator.Add},
2ce5209f1954 Starting to work on bool support, for now == works
Anders Halager <halager@gmail.com>
parents: 5
diff changeset
520 {Tok.Sub, 3, true, BinaryExp.Operator.Sub},
10
2f493057cf17 Some support for the rest of the boolean operators
Anders Halager <halager@gmail.com>
parents: 7
diff changeset
521
7
2ce5209f1954 Starting to work on bool support, for now == works
Anders Halager <halager@gmail.com>
parents: 5
diff changeset
522 {Tok.Mul, 5, true, BinaryExp.Operator.Mul},
2ce5209f1954 Starting to work on bool support, for now == works
Anders Halager <halager@gmail.com>
parents: 5
diff changeset
523 {Tok.Div, 5, true, BinaryExp.Operator.Div}
1
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
524 ];
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
525 BinOp* binary(Tok t)
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
526 {
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
527 foreach (ref op; _binary)
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
528 if (op.tokenType == t)
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
529 return &op;
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
530 return null;
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
531 }
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
532
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
533 private:
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
534
36
ce17bea8e9bd Switch statements support
Anders Halager <halager@gmail.com>
parents: 33
diff changeset
535 Token require(Tok t)
1
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
536 {
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
537 if (lexer.peek().type != t)
36
ce17bea8e9bd Switch statements support
Anders Halager <halager@gmail.com>
parents: 33
diff changeset
538 throw error(__LINE__, UnexpectedTokSingle)
29
41d23f2762c3 Merge, and updated Error class
Anders Halager <halager@gmail.com>
parents: 28
diff changeset
539 .arg(lexer.peek.getType)
33
084c2c147c4f Improvements to the Error class.
Anders Halager <halager@gmail.com>
parents: 30
diff changeset
540 .arg(t);
36
ce17bea8e9bd Switch statements support
Anders Halager <halager@gmail.com>
parents: 33
diff changeset
541 return lexer.next();
ce17bea8e9bd Switch statements support
Anders Halager <halager@gmail.com>
parents: 33
diff changeset
542 }
ce17bea8e9bd Switch statements support
Anders Halager <halager@gmail.com>
parents: 33
diff changeset
543
ce17bea8e9bd Switch statements support
Anders Halager <halager@gmail.com>
parents: 33
diff changeset
544 bool skip(Tok t)
ce17bea8e9bd Switch statements support
Anders Halager <halager@gmail.com>
parents: 33
diff changeset
545 {
ce17bea8e9bd Switch statements support
Anders Halager <halager@gmail.com>
parents: 33
diff changeset
546 if (lexer.peek().type != t)
ce17bea8e9bd Switch statements support
Anders Halager <halager@gmail.com>
parents: 33
diff changeset
547 return false;
1
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
548 lexer.next();
36
ce17bea8e9bd Switch statements support
Anders Halager <halager@gmail.com>
parents: 33
diff changeset
549 return true;
1
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
550 }
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
551
29
41d23f2762c3 Merge, and updated Error class
Anders Halager <halager@gmail.com>
parents: 28
diff changeset
552 Error error(uint line, char[] errMsg, Token* tok = null)
1
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
553 {
29
41d23f2762c3 Merge, and updated Error class
Anders Halager <halager@gmail.com>
parents: 28
diff changeset
554 Location loc;
41d23f2762c3 Merge, and updated Error class
Anders Halager <halager@gmail.com>
parents: 28
diff changeset
555 if (tok is null)
41d23f2762c3 Merge, and updated Error class
Anders Halager <halager@gmail.com>
parents: 28
diff changeset
556 loc = lexer.peek.location;
41d23f2762c3 Merge, and updated Error class
Anders Halager <halager@gmail.com>
parents: 28
diff changeset
557 else
41d23f2762c3 Merge, and updated Error class
Anders Halager <halager@gmail.com>
parents: 28
diff changeset
558 loc = tok.location;
33
084c2c147c4f Improvements to the Error class.
Anders Halager <halager@gmail.com>
parents: 30
diff changeset
559 auto e =
084c2c147c4f Improvements to the Error class.
Anders Halager <halager@gmail.com>
parents: 30
diff changeset
560 new Error("Parser.d(" ~ Integer.toString(line) ~ "): " ~errMsg);
084c2c147c4f Improvements to the Error class.
Anders Halager <halager@gmail.com>
parents: 30
diff changeset
561 e.loc(loc);
084c2c147c4f Improvements to the Error class.
Anders Halager <halager@gmail.com>
parents: 30
diff changeset
562 if (tok !is null)
084c2c147c4f Improvements to the Error class.
Anders Halager <halager@gmail.com>
parents: 30
diff changeset
563 e.tok(*tok);
084c2c147c4f Improvements to the Error class.
Anders Halager <halager@gmail.com>
parents: 30
diff changeset
564 return e;
1
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
565 }
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
566
33
084c2c147c4f Improvements to the Error class.
Anders Halager <halager@gmail.com>
parents: 30
diff changeset
567 static char[]
36
ce17bea8e9bd Switch statements support
Anders Halager <halager@gmail.com>
parents: 33
diff changeset
568 UnexpectedTokMulti = "Unexpected token, got %0 expected one of %1",
ce17bea8e9bd Switch statements support
Anders Halager <halager@gmail.com>
parents: 33
diff changeset
569 UnexpectedTokSingle = "Unexpected token, got %0 expected %1",
ce17bea8e9bd Switch statements support
Anders Halager <halager@gmail.com>
parents: 33
diff changeset
570 UnexpectedTok = "Unexpected token %0";
ce17bea8e9bd Switch statements support
Anders Halager <halager@gmail.com>
parents: 33
diff changeset
571
ce17bea8e9bd Switch statements support
Anders Halager <halager@gmail.com>
parents: 33
diff changeset
572 static char[]
ce17bea8e9bd Switch statements support
Anders Halager <halager@gmail.com>
parents: 33
diff changeset
573 CaseValueMustBeInt = "Cases can only be integer literals";
33
084c2c147c4f Improvements to the Error class.
Anders Halager <halager@gmail.com>
parents: 30
diff changeset
574
1
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
575 Lexer lexer;
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
576 }