annotate parser/Parser.d @ 36:ce17bea8e9bd new_gen

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