annotate parser/Parser.d @ 28:69464d465284 new_gen

Now supporting structs - both read and write. Still a few errors though, so watch out.
author Anders Johnsen <skabet@gmail.com>
date Sun, 20 Apr 2008 11:20:28 +0200
parents e331e4e816e4
children 41d23f2762c3
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:
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
72 char[] c = t.getType;
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
73 error("Unexpexted token "~c~" at line "~Integer.toString(__LINE__));
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
74 }
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
75 break;
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
76 default:
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
77 char[] c = t.getType;
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
78 error("Unexpexted token "~c~" at line "~Integer.toString(__LINE__));
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
79 }
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
80 break;
22
e331e4e816e4 now handling structs to some extend
johnsen@johnsen-laptop
parents: 21
diff changeset
81 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
82 lexer.next;
22
e331e4e816e4 now handling structs to some extend
johnsen@johnsen-laptop
parents: 21
diff changeset
83 Token iden = lexer.next;
e331e4e816e4 now handling structs to some extend
johnsen@johnsen-laptop
parents: 21
diff changeset
84 switch(iden.type)
e331e4e816e4 now handling structs to some extend
johnsen@johnsen-laptop
parents: 21
diff changeset
85 {
e331e4e816e4 now handling structs to some extend
johnsen@johnsen-laptop
parents: 21
diff changeset
86 case Tok.Identifier:
e331e4e816e4 now handling structs to some extend
johnsen@johnsen-laptop
parents: 21
diff changeset
87 Identifier identifier = new Identifier(iden);
e331e4e816e4 now handling structs to some extend
johnsen@johnsen-laptop
parents: 21
diff changeset
88 return new StructDecl (identifier, parseStruct());
e331e4e816e4 now handling structs to some extend
johnsen@johnsen-laptop
parents: 21
diff changeset
89 default:
e331e4e816e4 now handling structs to some extend
johnsen@johnsen-laptop
parents: 21
diff changeset
90 throw new Error("Expected struct identifier, but got "~iden.getType,
e331e4e816e4 now handling structs to some extend
johnsen@johnsen-laptop
parents: 21
diff changeset
91 iden.location);
e331e4e816e4 now handling structs to some extend
johnsen@johnsen-laptop
parents: 21
diff changeset
92 }
1
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
93 case Tok.EOF:
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
94 return null;
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
95 default:
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
96 char[] c = t.getType;
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
97 error("Unexpexted token "~c~" at line "~Integer.toString(__LINE__));
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
98 }
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
99 }
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
100
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
101 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
102 {
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 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
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 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
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 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
108 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
109 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
110 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
111 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
112 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
113 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
114 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
115
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 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
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 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
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 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
121 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
122 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
123 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
124 {
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 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
126 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
127 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
128 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
129 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
130 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
131 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
132 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
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 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
135 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
136 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
137 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
138 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
139 char[] c = t.getType;
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 error("Unexpexted token "~c~" at line "~Integer.toString(__LINE__));
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 }
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 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
143 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
144 char[] c = t.getType;
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
145 error("Unexpexted token "~c~" at line "~Integer.toString(__LINE__));
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 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
149 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
150 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
151 char[] c = t.getType;
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
152 error("Unexpexted token "~c~" at line "~Integer.toString(__LINE__));
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
153 }
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
22
e331e4e816e4 now handling structs to some extend
johnsen@johnsen-laptop
parents: 21
diff changeset
156 VarDecl[] parseStruct()
e331e4e816e4 now handling structs to some extend
johnsen@johnsen-laptop
parents: 21
diff changeset
157 {
e331e4e816e4 now handling structs to some extend
johnsen@johnsen-laptop
parents: 21
diff changeset
158 VarDecl[] varDecls;
e331e4e816e4 now handling structs to some extend
johnsen@johnsen-laptop
parents: 21
diff changeset
159 require(Tok.OpenBrace);
e331e4e816e4 now handling structs to some extend
johnsen@johnsen-laptop
parents: 21
diff changeset
160 while(lexer.peek.type != Tok.CloseBrace)
e331e4e816e4 now handling structs to some extend
johnsen@johnsen-laptop
parents: 21
diff changeset
161 {
e331e4e816e4 now handling structs to some extend
johnsen@johnsen-laptop
parents: 21
diff changeset
162 varDecls ~= cast(VarDecl)parseDecl;
e331e4e816e4 now handling structs to some extend
johnsen@johnsen-laptop
parents: 21
diff changeset
163 }
e331e4e816e4 now handling structs to some extend
johnsen@johnsen-laptop
parents: 21
diff changeset
164
e331e4e816e4 now handling structs to some extend
johnsen@johnsen-laptop
parents: 21
diff changeset
165 require(Tok.CloseBrace);
e331e4e816e4 now handling structs to some extend
johnsen@johnsen-laptop
parents: 21
diff changeset
166 return varDecls;
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
1
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
169 Stmt parseStatement()
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
170 {
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
171 Token t = lexer.peek;
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
172
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
173 switch(t.type)
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
174 {
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
175 case Tok.Return:
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
176 lexer.next;
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
177 auto ret = new ReturnStmt();
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
178 ret.exp = parseExpression();
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
179 require(Tok.Seperator);
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
180 return ret;
5
2c5a8f4c254a Added very simple if support.
Anders Halager <halager@gmail.com>
parents: 1
diff changeset
181
2c5a8f4c254a Added very simple if support.
Anders Halager <halager@gmail.com>
parents: 1
diff changeset
182 case Tok.If:
2c5a8f4c254a Added very simple if support.
Anders Halager <halager@gmail.com>
parents: 1
diff changeset
183 lexer.next;
2c5a8f4c254a Added very simple if support.
Anders Halager <halager@gmail.com>
parents: 1
diff changeset
184 require(Tok.OpenParentheses);
2c5a8f4c254a Added very simple if support.
Anders Halager <halager@gmail.com>
parents: 1
diff changeset
185 auto condition = parseExpression();
2c5a8f4c254a Added very simple if support.
Anders Halager <halager@gmail.com>
parents: 1
diff changeset
186 require(Tok.CloseParentheses);
2c5a8f4c254a Added very simple if support.
Anders Halager <halager@gmail.com>
parents: 1
diff changeset
187
11
642c6a998fd9 Support for while statements and fixed scope for if
Anders Halager <halager@gmail.com>
parents: 10
diff changeset
188 auto then_body = parseBlockOrSingleStmt();
642c6a998fd9 Support for while statements and fixed scope for if
Anders Halager <halager@gmail.com>
parents: 10
diff changeset
189
642c6a998fd9 Support for while statements and fixed scope for if
Anders Halager <halager@gmail.com>
parents: 10
diff changeset
190 Stmt[] else_body;
642c6a998fd9 Support for while statements and fixed scope for if
Anders Halager <halager@gmail.com>
parents: 10
diff changeset
191 if (lexer.peek.type == Tok.Else)
5
2c5a8f4c254a Added very simple if support.
Anders Halager <halager@gmail.com>
parents: 1
diff changeset
192 {
2c5a8f4c254a Added very simple if support.
Anders Halager <halager@gmail.com>
parents: 1
diff changeset
193 lexer.next;
11
642c6a998fd9 Support for while statements and fixed scope for if
Anders Halager <halager@gmail.com>
parents: 10
diff changeset
194 else_body = parseBlockOrSingleStmt();
5
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
642c6a998fd9 Support for while statements and fixed scope for if
Anders Halager <halager@gmail.com>
parents: 10
diff changeset
197 return new IfStmt(condition, then_body, else_body);
5
2c5a8f4c254a Added very simple if support.
Anders Halager <halager@gmail.com>
parents: 1
diff changeset
198
11
642c6a998fd9 Support for while statements and fixed scope for if
Anders Halager <halager@gmail.com>
parents: 10
diff changeset
199 case Tok.While:
642c6a998fd9 Support for while statements and fixed scope for if
Anders Halager <halager@gmail.com>
parents: 10
diff changeset
200 lexer.next;
642c6a998fd9 Support for while statements and fixed scope for if
Anders Halager <halager@gmail.com>
parents: 10
diff changeset
201 require(Tok.OpenParentheses);
642c6a998fd9 Support for while statements and fixed scope for if
Anders Halager <halager@gmail.com>
parents: 10
diff changeset
202 auto condition = parseExpression();
642c6a998fd9 Support for while statements and fixed scope for if
Anders Halager <halager@gmail.com>
parents: 10
diff changeset
203 require(Tok.CloseParentheses);
642c6a998fd9 Support for while statements and fixed scope for if
Anders Halager <halager@gmail.com>
parents: 10
diff changeset
204 return new WhileStmt(condition, parseBlockOrSingleStmt());
5
2c5a8f4c254a Added very simple if support.
Anders Halager <halager@gmail.com>
parents: 1
diff changeset
205
1
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
206 case Tok.Identifier:
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
207 Token n = lexer.peek(1);
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
208 switch(n.type)
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
209 {
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
210 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
211 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
212 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
213 {
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
214 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
215 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
216 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
217 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
218 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
219 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
220 }
1
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
221 case Tok.Assign:
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
222 lexer.next;
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
223 lexer.next;
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
224 auto stmt = new ExpStmt(new AssignExp(new Identifier(t), parseExpression()));
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
225 require(Tok.Seperator);
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
226 return stmt;
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
227 break;
22
e331e4e816e4 now handling structs to some extend
johnsen@johnsen-laptop
parents: 21
diff changeset
228 case Tok.Identifier:
e331e4e816e4 now handling structs to some extend
johnsen@johnsen-laptop
parents: 21
diff changeset
229 auto decl = new DeclStmt(parseDecl());
e331e4e816e4 now handling structs to some extend
johnsen@johnsen-laptop
parents: 21
diff changeset
230 return decl;
1
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
231
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
232 default:
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
233 auto e = new ExpStmt(parseExpression());
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
234 require(Tok.Seperator);
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
235 return e;
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
236
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
237 }
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
238 break;
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 decl = new DeclStmt(parseDecl());
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
242 //require(Tok.Seperator);
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
243 return decl;
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
244 }
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
245 return new Stmt();
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
246 }
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
247
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
248 FuncDecl parseFunc(Identifier type, Identifier identifier)
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
249 {
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
250 VarDecl[] funcArgs = parseFuncArgs();
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
251
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
252 lexer.next; // Remove the "{"
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
253
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
254 Stmt[] statements;
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
255
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
256 while(lexer.peek.type != Tok.CloseBrace)
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
257 statements ~= parseStatement();
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
258
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
259 lexer.next; // Remove "}"
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
260
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
261 return new FuncDecl(type, identifier, funcArgs, statements);
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
262 }
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
263
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
264 VarDecl[] parseFuncArgs()
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
265 {
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
266 lexer.next; // Remove the "(" token.
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
267
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
268 VarDecl[] funcArgs;
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
269
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
270 while(lexer.peek.type != Tok.CloseParentheses)
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
271 {
21
0fb2d13dce37 Now working with gdc also (gdc use reverse paremeter validating on function calls)
johnsen@johnsen-laptop
parents: 12
diff changeset
272 auto t = parseType;
0fb2d13dce37 Now working with gdc also (gdc use reverse paremeter validating on function calls)
johnsen@johnsen-laptop
parents: 12
diff changeset
273 auto i = parseIdentifier;
0fb2d13dce37 Now working with gdc also (gdc use reverse paremeter validating on function calls)
johnsen@johnsen-laptop
parents: 12
diff changeset
274 funcArgs ~= new VarDecl(t, i);
1
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
275
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
276 if(lexer.peek.type == Tok.Comma)
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
277 lexer.next;
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
278 }
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
279
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
280 lexer.next; // Remove the ")"
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
281
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
282 return funcArgs;
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
283 }
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
284
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
285 Identifier parseIdentifier()
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
286 {
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
287 Token identifier = lexer.next;
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
288
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
289 switch(identifier.type)
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
290 {
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
291 case Tok.Identifier:
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
292 return new Identifier(identifier);
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
293 break;
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
294 default:
21
0fb2d13dce37 Now working with gdc also (gdc use reverse paremeter validating on function calls)
johnsen@johnsen-laptop
parents: 12
diff changeset
295 throw new Error("Unexpexted token in Identifier parsing. Got "~identifier.getType, identifier.location);
1
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
296 }
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
297 }
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
298
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
299 Identifier parseType()
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
300 {
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
301 Token type = lexer.next;
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
302
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
303 switch(type.type)
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
304 {
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
305 case Tok.Byte, Tok.Ubyte,
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
306 Tok.Short, Tok.Ushort,
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
307 Tok.Int, Tok.Uint,
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
308 Tok.Long, Tok.Ulong,
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
309 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
310 Tok.Bool,
1
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
311 Tok.Identifier:
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
312 return new Identifier(type);
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
313 break;
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
314 default:
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
315 char[] c = type.getType;
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
316 error("Unexpexted token in Type parsing. Got "~c);
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
317 }
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
318 }
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
319
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
320 // -- Expression parsing -- //
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
321 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
322 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
323 {
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
324 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
325 {
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
326 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
327 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
328 {
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
329 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
330 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
331 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
332 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
333 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
334 throw new Error("Expected identifier after '.'", lexer.peek(1).location);
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
335 }
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
336 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
337 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
338 }
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
339 }
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
340
1
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
341 Exp parseExpression(int p = 0)
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
342 {
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
343 auto exp = P();
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
344 Token next = lexer.peek();
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
345 BinOp* op = null;
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
346 while ((op = binary(next.type)) != null && op.prec >= p)
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
347 {
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
348 lexer.next();
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
349 int q = op.leftAssoc? 1 + op.prec : op.prec;
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
350 auto exp2 = parseExpression(q);
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
351 exp = new BinaryExp(op.operator, exp, exp2);
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
352 next = lexer.peek();
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
353 }
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
354
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
355 return exp;
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
356 }
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
357
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
358 Exp P()
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
359 {
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
360 Token next = lexer.next();
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
361 if (auto op = unary(next.type))
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
362 return new NegateExp(parseExpression(op.prec));
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
363 else if (next.type == Tok.OpenParentheses)
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
364 {
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
365 auto e = parseExpression(0);
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
366 require(Tok.CloseParentheses);
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
367 return e;
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
368 }
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
369 else if (next.type == Tok.Identifier)
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
370 {
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
371 Exp iden = parseExpIdentifier(new Identifier(next));
1
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
372 switch(lexer.peek.type)
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
373 {
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
374 case Tok.OpenParentheses:
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
375 lexer.next;
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
376 Exp[] args;
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
377 while(lexer.peek.type != Tok.CloseParentheses)
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
378 {
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
379 if(lexer.peek.type == Tok.Comma)
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
380 {
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
381 lexer.next;
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
382 }
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
383 args ~= parseExpression();
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
384 }
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
385
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
386 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
387 return new CallExp(iden, args);
1
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
388
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
389 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
390 return iden;
1
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
391 }
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
392 }
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
393 else if (next.type == Tok.Integer)
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
394 return new IntegerLit(next);
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
395
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
396 Stdout.formatln("{}", next.getType);
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
397 assert(0, "Should not happen");
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
398 }
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
399
11
642c6a998fd9 Support for while statements and fixed scope for if
Anders Halager <halager@gmail.com>
parents: 10
diff changeset
400 private Stmt[] parseBlockOrSingleStmt()
642c6a998fd9 Support for while statements and fixed scope for if
Anders Halager <halager@gmail.com>
parents: 10
diff changeset
401 {
642c6a998fd9 Support for while statements and fixed scope for if
Anders Halager <halager@gmail.com>
parents: 10
diff changeset
402 Stmt[] stmts;
642c6a998fd9 Support for while statements and fixed scope for if
Anders Halager <halager@gmail.com>
parents: 10
diff changeset
403 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
404 {
642c6a998fd9 Support for while statements and fixed scope for if
Anders Halager <halager@gmail.com>
parents: 10
diff changeset
405 lexer.next;
642c6a998fd9 Support for while statements and fixed scope for if
Anders Halager <halager@gmail.com>
parents: 10
diff changeset
406 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
407 stmts ~= parseStatement();
642c6a998fd9 Support for while statements and fixed scope for if
Anders Halager <halager@gmail.com>
parents: 10
diff changeset
408 lexer.next;
642c6a998fd9 Support for while statements and fixed scope for if
Anders Halager <halager@gmail.com>
parents: 10
diff changeset
409 }
642c6a998fd9 Support for while statements and fixed scope for if
Anders Halager <halager@gmail.com>
parents: 10
diff changeset
410 else
642c6a998fd9 Support for while statements and fixed scope for if
Anders Halager <halager@gmail.com>
parents: 10
diff changeset
411 stmts ~= parseStatement();
642c6a998fd9 Support for while statements and fixed scope for if
Anders Halager <halager@gmail.com>
parents: 10
diff changeset
412
642c6a998fd9 Support for while statements and fixed scope for if
Anders Halager <halager@gmail.com>
parents: 10
diff changeset
413 return stmts;
642c6a998fd9 Support for while statements and fixed scope for if
Anders Halager <halager@gmail.com>
parents: 10
diff changeset
414 }
642c6a998fd9 Support for while statements and fixed scope for if
Anders Halager <halager@gmail.com>
parents: 10
diff changeset
415
1
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
416 struct UnOp
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
417 {
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
418 Tok tokenType;
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
419 int prec;
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
420 }
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
421
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
422 static UnOp[] _unary = [{Tok.Sub, 4}];
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
423 UnOp* unary(Tok t)
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
424 {
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
425 foreach (ref op; _unary)
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
426 if (op.tokenType == t)
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
427 return &op;
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
428 return null;
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
429 }
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
430
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
431 struct BinOp
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
432 {
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
433 Tok tokenType;
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
434 int prec;
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
435 bool leftAssoc;
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
436 BinaryExp.Operator operator;
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
437 }
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
438
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
439 static BinOp[] _binary =
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
440 [
10
2f493057cf17 Some support for the rest of the boolean operators
Anders Halager <halager@gmail.com>
parents: 7
diff changeset
441 {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
442 {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
443 {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
444 {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
445 {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
446 {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
447
7
2ce5209f1954 Starting to work on bool support, for now == works
Anders Halager <halager@gmail.com>
parents: 5
diff changeset
448 {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
449 {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
450
7
2ce5209f1954 Starting to work on bool support, for now == works
Anders Halager <halager@gmail.com>
parents: 5
diff changeset
451 {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
452 {Tok.Div, 5, true, BinaryExp.Operator.Div}
1
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
453 ];
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
454 BinOp* binary(Tok t)
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
455 {
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
456 foreach (ref op; _binary)
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
457 if (op.tokenType == t)
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
458 return &op;
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
459 return null;
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
460 }
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
461
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
462 private:
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
463
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
464 void require(Tok t)
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
465 {
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
466 if (lexer.peek().type != t)
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
467 error("Unexpexted token: Got '"~lexer.peek.getType~"' Expected '"~typeToString[t]~"'");
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
468 lexer.next();
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
469 }
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
470
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
471 void error(char[] errMsg)
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
472 {
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
473 throw new Exception("Parser error: " ~errMsg);
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
474 }
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
475
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
476 Lexer lexer;
2168f4cb73f1 First push
johnsen@johnsen-desktop
parents:
diff changeset
477 }