projects/dang: ast/Exp.d annotate

annotate ast/Exp.d @ 164:ba94fd563548

The symbol for the constructor a "new"-exp is calling is now stored in callSym in NewExp.

author	Anders Johnsen <skabet@gmail.com>
date	Tue, 22 Jul 2008 16:53:47 +0200
parents	0f38f1a0f06f
children	7982eb63c0eb

rev	line source
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	1 module ast.Exp;
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	2
129 ed815b31479b Added a Symbol Anders Halager <halager@gmail.com> parents: 126 diff changeset	3 import tango.text.Util,
ed815b31479b Added a Symbol Anders Halager <halager@gmail.com> parents: 126 diff changeset	4 Integer = tango.text.convert.Integer;
56 4ae365eff712 Now return types works for structs... Also, simplyfing in AST have been startet - but still messy. This update is a little messy... Anders Johnsen <skabet@gmail.com> parents: 55 diff changeset	5 import tango.io.Stdout;
4ae365eff712 Now return types works for structs... Also, simplyfing in AST have been startet - but still messy. This update is a little messy... Anders Johnsen <skabet@gmail.com> parents: 55 diff changeset	6
4ae365eff712 Now return types works for structs... Also, simplyfing in AST have been startet - but still messy. This update is a little messy... Anders Johnsen <skabet@gmail.com> parents: 55 diff changeset	7 import ast.Decl,
4ae365eff712 Now return types works for structs... Also, simplyfing in AST have been startet - but still messy. This update is a little messy... Anders Johnsen <skabet@gmail.com> parents: 55 diff changeset	8 ast.Stmt;
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	9
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	10 import lexer.Token;
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	11
92 771ac63898e2 A few better parser errors plus renaming most of the sema classes to match that they do now. Some have changes a lot. Anders Johnsen <skabet@gmail.com> parents: 88 diff changeset	12 import sema.Scope,
129 ed815b31479b Added a Symbol Anders Halager <halager@gmail.com> parents: 126 diff changeset	13 sema.Symbol,
58 fc62c5296a1c Add types to our Exp Anders Halager <halager@gmail.com> parents: 56 diff changeset	14 sema.DType;
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	15
119 c0b531362ca6 Non compileing commit. Work on floating points and casts Anders Johnsen <skabet@gmail.com> parents: 114 diff changeset	16 import basic.LiteralParsing;
c0b531362ca6 Non compileing commit. Work on floating points and casts Anders Johnsen <skabet@gmail.com> parents: 114 diff changeset	17
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	18 enum ExpType
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	19 {
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	20 Binary,
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	21 Negate,
78 ad956143dcdc Parse and gen for dereferences Anders Halager <halager@gmail.com> parents: 72 diff changeset	22 Deref,
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	23 IntegerLit,
55 79cb0afafabe Now structs are somewhat useable to use. Anders Johnsen <skabet@gmail.com> parents: 48 diff changeset	24 MemberReference,
83 9e90694f5da0 Parse array indexing, and allow reading from arrays Anders Halager <halager@gmail.com> parents: 81 diff changeset	25 Index,
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	26 Identifier,
72 628cb46ab13b First update on the way to Arrays! :) Anders Johnsen <skabet@gmail.com> parents: 68 diff changeset	27 ArrayIdentifier,
136 2be29b296081 Lots of changes: johnsen@johnsen-laptop parents: 129 diff changeset	28 StaticArrayIdentifier,
77 13eea2c4e60d Now able of --ast-dump-code with Pointer types and also codeGen int* x; Anders Johnsen <skabet@gmail.com> parents: 72 diff changeset	29 PointerIdentifier,
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	30 AssignExp,
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	31 CallExp,
68 381975d76baf A LOT of bug fixing - also implemented implicit casts. If you do a --ast-dump-code on a target with some algebra of differant types, you should now see the type casts being made. Also, Tests are again back with only switches failing... Anders Johnsen <skabet@gmail.com> parents: 67 diff changeset	32 CastExp,
104 7ff4bc2accf2 Lexing more types of strings. Now all's left is to parse the string in the AST. Anders Johnsen <skabet@gmail.com> parents: 98 diff changeset	33 StringExp,
158 57b0b4464a0b Parsing "new", putting it in AST and performs some tests on it. Eg. if the contructor exists and the params matches. Anders Johnsen <skabet@gmail.com> parents: 145 diff changeset	34 NewExp,
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	35 }
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	36
107 189c049cbfcc Cleanup of codegen, better support for operators a few bugfixes Anders Halager <halager@gmail.com> parents: 98 diff changeset	37 abstract class Exp
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	38 {
88 eb5b2c719a39 Major change to locations, tokens and expressions. Anders Halager <halager@gmail.com> parents: 86 diff changeset	39 this(ExpType expType, SLoc loc)
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	40 {
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	41 this.expType = expType;
88 eb5b2c719a39 Major change to locations, tokens and expressions. Anders Halager <halager@gmail.com> parents: 86 diff changeset	42 this.loc = loc;
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	43 }
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	44
129 ed815b31479b Added a Symbol Anders Halager <halager@gmail.com> parents: 126 diff changeset	45 /**
ed815b31479b Added a Symbol Anders Halager <halager@gmail.com> parents: 126 diff changeset	46 Get the fully qualified name for the expression (if it can be resolved to
ed815b31479b Added a Symbol Anders Halager <halager@gmail.com> parents: 126 diff changeset	47 one) - otherwise null is returned
ed815b31479b Added a Symbol Anders Halager <halager@gmail.com> parents: 126 diff changeset	48 **/
ed815b31479b Added a Symbol Anders Halager <halager@gmail.com> parents: 126 diff changeset	49 char[] getFQN() { return null; }
ed815b31479b Added a Symbol Anders Halager <halager@gmail.com> parents: 126 diff changeset	50
ed815b31479b Added a Symbol Anders Halager <halager@gmail.com> parents: 126 diff changeset	51 /// The same as getFQN, except that the name is mangled
ed815b31479b Added a Symbol Anders Halager <halager@gmail.com> parents: 126 diff changeset	52 char[] getMangledFQN() { return null; }
ed815b31479b Added a Symbol Anders Halager <halager@gmail.com> parents: 126 diff changeset	53
ed815b31479b Added a Symbol Anders Halager <halager@gmail.com> parents: 126 diff changeset	54 /**
ed815b31479b Added a Symbol Anders Halager <halager@gmail.com> parents: 126 diff changeset	55 Try to get the symbol the expression represents.
ed815b31479b Added a Symbol Anders Halager <halager@gmail.com> parents: 126 diff changeset	56
ed815b31479b Added a Symbol Anders Halager <halager@gmail.com> parents: 126 diff changeset	57 Returns null for most expressions as they don't represent any symbol.
ed815b31479b Added a Symbol Anders Halager <halager@gmail.com> parents: 126 diff changeset	58 Identifiers and member references can have a sensible value.
ed815b31479b Added a Symbol Anders Halager <halager@gmail.com> parents: 126 diff changeset	59 **/
ed815b31479b Added a Symbol Anders Halager <halager@gmail.com> parents: 126 diff changeset	60 Symbol getSymbol() { return null; }
ed815b31479b Added a Symbol Anders Halager <halager@gmail.com> parents: 126 diff changeset	61
88 eb5b2c719a39 Major change to locations, tokens and expressions. Anders Halager <halager@gmail.com> parents: 86 diff changeset	62 /// Get the type of the expression
110 2deb4c1f0d93 Make it compile Anders Halager <halager@gmail.com> parents: 109 diff changeset	63 abstract DType type();
58 fc62c5296a1c Add types to our Exp Anders Halager <halager@gmail.com> parents: 56 diff changeset	64
88 eb5b2c719a39 Major change to locations, tokens and expressions. Anders Halager <halager@gmail.com> parents: 86 diff changeset	65 /// Indicates which type the expression is - to avoid a lot of casts
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	66 ExpType expType;
88 eb5b2c719a39 Major change to locations, tokens and expressions. Anders Halager <halager@gmail.com> parents: 86 diff changeset	67
eb5b2c719a39 Major change to locations, tokens and expressions. Anders Halager <halager@gmail.com> parents: 86 diff changeset	68 /// The environment of the expression
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	69 Scope env;
88 eb5b2c719a39 Major change to locations, tokens and expressions. Anders Halager <halager@gmail.com> parents: 86 diff changeset	70
129 ed815b31479b Added a Symbol Anders Halager <halager@gmail.com> parents: 126 diff changeset	71 Symbol symbol;
ed815b31479b Added a Symbol Anders Halager <halager@gmail.com> parents: 126 diff changeset	72
56 4ae365eff712 Now return types works for structs... Also, simplyfing in AST have been startet - but still messy. This update is a little messy... Anders Johnsen <skabet@gmail.com> parents: 55 diff changeset	73 int stmtIndex;
4ae365eff712 Now return types works for structs... Also, simplyfing in AST have been startet - but still messy. This update is a little messy... Anders Johnsen <skabet@gmail.com> parents: 55 diff changeset	74
88 eb5b2c719a39 Major change to locations, tokens and expressions. Anders Halager <halager@gmail.com> parents: 86 diff changeset	75 /**
eb5b2c719a39 Major change to locations, tokens and expressions. Anders Halager <halager@gmail.com> parents: 86 diff changeset	76 The "main" location of the expression.
eb5b2c719a39 Major change to locations, tokens and expressions. Anders Halager <halager@gmail.com> parents: 86 diff changeset	77 What exactly this represents varies but for most things its the start
eb5b2c719a39 Major change to locations, tokens and expressions. Anders Halager <halager@gmail.com> parents: 86 diff changeset	78 while for a binary expression its the operator.
eb5b2c719a39 Major change to locations, tokens and expressions. Anders Halager <halager@gmail.com> parents: 86 diff changeset	79 **/
eb5b2c719a39 Major change to locations, tokens and expressions. Anders Halager <halager@gmail.com> parents: 86 diff changeset	80 SourceLocation loc;
eb5b2c719a39 Major change to locations, tokens and expressions. Anders Halager <halager@gmail.com> parents: 86 diff changeset	81
eb5b2c719a39 Major change to locations, tokens and expressions. Anders Halager <halager@gmail.com> parents: 86 diff changeset	82 /// Return the starting location of this expression
eb5b2c719a39 Major change to locations, tokens and expressions. Anders Halager <halager@gmail.com> parents: 86 diff changeset	83 SourceLocation startLoc() { return loc; }
eb5b2c719a39 Major change to locations, tokens and expressions. Anders Halager <halager@gmail.com> parents: 86 diff changeset	84
eb5b2c719a39 Major change to locations, tokens and expressions. Anders Halager <halager@gmail.com> parents: 86 diff changeset	85 /// Get the full extents of the expression
eb5b2c719a39 Major change to locations, tokens and expressions. Anders Halager <halager@gmail.com> parents: 86 diff changeset	86 SourceRange sourceRange() { return SourceRange(loc, loc + 1); }
eb5b2c719a39 Major change to locations, tokens and expressions. Anders Halager <halager@gmail.com> parents: 86 diff changeset	87
107 189c049cbfcc Cleanup of codegen, better support for operators a few bugfixes Anders Halager <halager@gmail.com> parents: 98 diff changeset	88 /// Do some simplifications
189c049cbfcc Cleanup of codegen, better support for operators a few bugfixes Anders Halager <halager@gmail.com> parents: 98 diff changeset	89 Exp simplify() { return this; }
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	90 }
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	91
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	92 class CallExp : Exp
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	93 {
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	94 this(Exp exp, Exp[] args)
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	95 {
88 eb5b2c719a39 Major change to locations, tokens and expressions. Anders Halager <halager@gmail.com> parents: 86 diff changeset	96 super(ExpType.CallExp, exp.loc);
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	97 this.exp = exp;
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	98 this.args = args;
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	99 }
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	100
58 fc62c5296a1c Add types to our Exp Anders Halager <halager@gmail.com> parents: 56 diff changeset	101 override DType type()
fc62c5296a1c Add types to our Exp Anders Halager <halager@gmail.com> parents: 56 diff changeset	102 {
fc62c5296a1c Add types to our Exp Anders Halager <halager@gmail.com> parents: 56 diff changeset	103 DFunction f = cast(DFunction)exp.type();
59 1d6f4ad38a91 Make most of the tests pass again Anders Halager <halager@gmail.com> parents: 58 diff changeset	104 assert(f !is null, "Can only call functions");
63 9f8131676242 Now Decl's have a DType type(), and should use varType and returnType to get the old type id Anders Halager <halager@gmail.com> parents: 60 diff changeset	105 return f.returnType;
58 fc62c5296a1c Add types to our Exp Anders Halager <halager@gmail.com> parents: 56 diff changeset	106 }
fc62c5296a1c Add types to our Exp Anders Halager <halager@gmail.com> parents: 56 diff changeset	107
139 a22e3663de89 Fixed up our simplify functions Anders Halager <halager@gmail.com> parents: 136 diff changeset	108 override CallExp simplify()
a22e3663de89 Fixed up our simplify functions Anders Halager <halager@gmail.com> parents: 136 diff changeset	109 {
a22e3663de89 Fixed up our simplify functions Anders Halager <halager@gmail.com> parents: 136 diff changeset	110 foreach (ref arg; args)
a22e3663de89 Fixed up our simplify functions Anders Halager <halager@gmail.com> parents: 136 diff changeset	111 arg = arg.simplify();
a22e3663de89 Fixed up our simplify functions Anders Halager <halager@gmail.com> parents: 136 diff changeset	112 exp = exp.simplify();
a22e3663de89 Fixed up our simplify functions Anders Halager <halager@gmail.com> parents: 136 diff changeset	113 return this;
a22e3663de89 Fixed up our simplify functions Anders Halager <halager@gmail.com> parents: 136 diff changeset	114 }
a22e3663de89 Fixed up our simplify functions Anders Halager <halager@gmail.com> parents: 136 diff changeset	115
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	116 Exp exp;
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	117 Exp[] args;
56 4ae365eff712 Now return types works for structs... Also, simplyfing in AST have been startet - but still messy. This update is a little messy... Anders Johnsen <skabet@gmail.com> parents: 55 diff changeset	118 bool sret = false;
4ae365eff712 Now return types works for structs... Also, simplyfing in AST have been startet - but still messy. This update is a little messy... Anders Johnsen <skabet@gmail.com> parents: 55 diff changeset	119
88 eb5b2c719a39 Major change to locations, tokens and expressions. Anders Halager <halager@gmail.com> parents: 86 diff changeset	120 override SourceRange sourceRange()
eb5b2c719a39 Major change to locations, tokens and expressions. Anders Halager <halager@gmail.com> parents: 86 diff changeset	121 {
eb5b2c719a39 Major change to locations, tokens and expressions. Anders Halager <halager@gmail.com> parents: 86 diff changeset	122 SourceRange res = exp.sourceRange;
eb5b2c719a39 Major change to locations, tokens and expressions. Anders Halager <halager@gmail.com> parents: 86 diff changeset	123 if (args.length > 0)
eb5b2c719a39 Major change to locations, tokens and expressions. Anders Halager <halager@gmail.com> parents: 86 diff changeset	124 res = res + args[$ - 1].sourceRange;
eb5b2c719a39 Major change to locations, tokens and expressions. Anders Halager <halager@gmail.com> parents: 86 diff changeset	125 return res;
eb5b2c719a39 Major change to locations, tokens and expressions. Anders Halager <halager@gmail.com> parents: 86 diff changeset	126 }
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	127 }
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	128
126 c3b24e7e8cf8 Carius changes to the parser. Parsing attributes, lexing many keywords(not all yet). Anders Johnsen <skabet@gmail.com> parents: 125 diff changeset	129 class AssignExp : BinaryExp
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	130 {
126 c3b24e7e8cf8 Carius changes to the parser. Parsing attributes, lexing many keywords(not all yet). Anders Johnsen <skabet@gmail.com> parents: 125 diff changeset	131 this(SLoc op_loc, Operator op, Exp identifier, Exp exp)
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	132 {
126 c3b24e7e8cf8 Carius changes to the parser. Parsing attributes, lexing many keywords(not all yet). Anders Johnsen <skabet@gmail.com> parents: 125 diff changeset	133 super(ExpType.AssignExp, op_loc, op, identifier, exp);
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	134 this.identifier = identifier;
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	135 this.exp = exp;
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	136 }
88 eb5b2c719a39 Major change to locations, tokens and expressions. Anders Halager <halager@gmail.com> parents: 86 diff changeset	137
139 a22e3663de89 Fixed up our simplify functions Anders Halager <halager@gmail.com> parents: 136 diff changeset	138 override AssignExp simplify()
56 4ae365eff712 Now return types works for structs... Also, simplyfing in AST have been startet - but still messy. This update is a little messy... Anders Johnsen <skabet@gmail.com> parents: 55 diff changeset	139 {
139 a22e3663de89 Fixed up our simplify functions Anders Halager <halager@gmail.com> parents: 136 diff changeset	140 identifier = identifier.simplify();
a22e3663de89 Fixed up our simplify functions Anders Halager <halager@gmail.com> parents: 136 diff changeset	141 exp = exp.simplify();
56 4ae365eff712 Now return types works for structs... Also, simplyfing in AST have been startet - but still messy. This update is a little messy... Anders Johnsen <skabet@gmail.com> parents: 55 diff changeset	142
4ae365eff712 Now return types works for structs... Also, simplyfing in AST have been startet - but still messy. This update is a little messy... Anders Johnsen <skabet@gmail.com> parents: 55 diff changeset	143 return this;
4ae365eff712 Now return types works for structs... Also, simplyfing in AST have been startet - but still messy. This update is a little messy... Anders Johnsen <skabet@gmail.com> parents: 55 diff changeset	144 }
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	145
88 eb5b2c719a39 Major change to locations, tokens and expressions. Anders Halager <halager@gmail.com> parents: 86 diff changeset	146 override SourceRange sourceRange()
eb5b2c719a39 Major change to locations, tokens and expressions. Anders Halager <halager@gmail.com> parents: 86 diff changeset	147 {
eb5b2c719a39 Major change to locations, tokens and expressions. Anders Halager <halager@gmail.com> parents: 86 diff changeset	148 return identifier.sourceRange + exp.sourceRange;
eb5b2c719a39 Major change to locations, tokens and expressions. Anders Halager <halager@gmail.com> parents: 86 diff changeset	149 }
eb5b2c719a39 Major change to locations, tokens and expressions. Anders Halager <halager@gmail.com> parents: 86 diff changeset	150
58 fc62c5296a1c Add types to our Exp Anders Halager <halager@gmail.com> parents: 56 diff changeset	151 override DType type() { return identifier.type(); }
fc62c5296a1c Add types to our Exp Anders Halager <halager@gmail.com> parents: 56 diff changeset	152
28 69464d465284 Now supporting structs - both read and write. Still a few errors though, so watch out. Anders Johnsen <skabet@gmail.com> parents: 10 diff changeset	153 Exp identifier;
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	154 Exp exp;
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	155 }
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	156
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	157 class BinaryExp : Exp
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	158 {
7 2ce5209f1954 Starting to work on bool support, for now == works Anders Halager <halager@gmail.com> parents: 1 diff changeset	159 public enum Operator
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	160 {
48 b6c1dc30ca4b Only tests that dont pass now are structs and switches Anders Halager <halager@gmail.com> parents: 44 diff changeset	161 Assign,
126 c3b24e7e8cf8 Carius changes to the parser. Parsing attributes, lexing many keywords(not all yet). Anders Johnsen <skabet@gmail.com> parents: 125 diff changeset	162 AddAssign,
c3b24e7e8cf8 Carius changes to the parser. Parsing attributes, lexing many keywords(not all yet). Anders Johnsen <skabet@gmail.com> parents: 125 diff changeset	163 SubAssign,
c3b24e7e8cf8 Carius changes to the parser. Parsing attributes, lexing many keywords(not all yet). Anders Johnsen <skabet@gmail.com> parents: 125 diff changeset	164 MulAssign,
c3b24e7e8cf8 Carius changes to the parser. Parsing attributes, lexing many keywords(not all yet). Anders Johnsen <skabet@gmail.com> parents: 125 diff changeset	165 DivAssign,
c3b24e7e8cf8 Carius changes to the parser. Parsing attributes, lexing many keywords(not all yet). Anders Johnsen <skabet@gmail.com> parents: 125 diff changeset	166 ModAssign,
48 b6c1dc30ca4b Only tests that dont pass now are structs and switches Anders Halager <halager@gmail.com> parents: 44 diff changeset	167
7 2ce5209f1954 Starting to work on bool support, for now == works Anders Halager <halager@gmail.com> parents: 1 diff changeset	168 Eq, Ne,
44 495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 28 diff changeset	169
10 2f493057cf17 Some support for the rest of the boolean operators Anders Halager <halager@gmail.com> parents: 7 diff changeset	170 Lt, Le,
2f493057cf17 Some support for the rest of the boolean operators Anders Halager <halager@gmail.com> parents: 7 diff changeset	171 Gt, Ge,
44 495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 28 diff changeset	172
7 2ce5209f1954 Starting to work on bool support, for now == works Anders Halager <halager@gmail.com> parents: 1 diff changeset	173 Add, Sub,
44 495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 28 diff changeset	174 Mul, Div, Mod,
123 6a5f745d351c Parsing <<, >> and >>>. Anders Johnsen <skabet@gmail.com> parents: 119 diff changeset	175
6a5f745d351c Parsing <<, >> and >>>. Anders Johnsen <skabet@gmail.com> parents: 119 diff changeset	176 LeftShift, RightShift, UnsignedRightShift,
125 d604152de1eb Support shifts and binary logical operators in codegen Anders Halager <halager@gmail.com> parents: 123 diff changeset	177
d604152de1eb Support shifts and binary logical operators in codegen Anders Halager <halager@gmail.com> parents: 123 diff changeset	178 And, Or, Xor,
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	179 }
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	180
126 c3b24e7e8cf8 Carius changes to the parser. Parsing attributes, lexing many keywords(not all yet). Anders Johnsen <skabet@gmail.com> parents: 125 diff changeset	181 char[][] getOp = ["=","+=","-=","=","/=","%=","==","!=","<","<=",">",">=","+","-","","/","%","<<",">>",">>>"];
68 381975d76baf A LOT of bug fixing - also implemented implicit casts. If you do a --ast-dump-code on a target with some algebra of differant types, you should now see the type casts being made. Also, Tests are again back with only switches failing... Anders Johnsen <skabet@gmail.com> parents: 67 diff changeset	182
88 eb5b2c719a39 Major change to locations, tokens and expressions. Anders Halager <halager@gmail.com> parents: 86 diff changeset	183 this(SLoc op_loc, Operator op, Exp left, Exp right)
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	184 {
88 eb5b2c719a39 Major change to locations, tokens and expressions. Anders Halager <halager@gmail.com> parents: 86 diff changeset	185 super(ExpType.Binary, op_loc);
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	186 this.op = op;
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	187 this.left = left;
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	188 this.right = right;
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	189 }
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	190
126 c3b24e7e8cf8 Carius changes to the parser. Parsing attributes, lexing many keywords(not all yet). Anders Johnsen <skabet@gmail.com> parents: 125 diff changeset	191 protected this(ExpType e, SLoc op_loc, Operator op, Exp left, Exp right)
c3b24e7e8cf8 Carius changes to the parser. Parsing attributes, lexing many keywords(not all yet). Anders Johnsen <skabet@gmail.com> parents: 125 diff changeset	192 {
c3b24e7e8cf8 Carius changes to the parser. Parsing attributes, lexing many keywords(not all yet). Anders Johnsen <skabet@gmail.com> parents: 125 diff changeset	193 super(e, op_loc);
c3b24e7e8cf8 Carius changes to the parser. Parsing attributes, lexing many keywords(not all yet). Anders Johnsen <skabet@gmail.com> parents: 125 diff changeset	194 this.op = op;
c3b24e7e8cf8 Carius changes to the parser. Parsing attributes, lexing many keywords(not all yet). Anders Johnsen <skabet@gmail.com> parents: 125 diff changeset	195 this.left = left;
c3b24e7e8cf8 Carius changes to the parser. Parsing attributes, lexing many keywords(not all yet). Anders Johnsen <skabet@gmail.com> parents: 125 diff changeset	196 this.right = right;
c3b24e7e8cf8 Carius changes to the parser. Parsing attributes, lexing many keywords(not all yet). Anders Johnsen <skabet@gmail.com> parents: 125 diff changeset	197 }
c3b24e7e8cf8 Carius changes to the parser. Parsing attributes, lexing many keywords(not all yet). Anders Johnsen <skabet@gmail.com> parents: 125 diff changeset	198
58 fc62c5296a1c Add types to our Exp Anders Halager <halager@gmail.com> parents: 56 diff changeset	199 override DType type()
fc62c5296a1c Add types to our Exp Anders Halager <halager@gmail.com> parents: 56 diff changeset	200 {
fc62c5296a1c Add types to our Exp Anders Halager <halager@gmail.com> parents: 56 diff changeset	201 if (myType)
fc62c5296a1c Add types to our Exp Anders Halager <halager@gmail.com> parents: 56 diff changeset	202 return myType;
fc62c5296a1c Add types to our Exp Anders Halager <halager@gmail.com> parents: 56 diff changeset	203
68 381975d76baf A LOT of bug fixing - also implemented implicit casts. If you do a --ast-dump-code on a target with some algebra of differant types, you should now see the type casts being made. Also, Tests are again back with only switches failing... Anders Johnsen <skabet@gmail.com> parents: 67 diff changeset	204 if (op == Operator.Eq \|\|
381975d76baf A LOT of bug fixing - also implemented implicit casts. If you do a --ast-dump-code on a target with some algebra of differant types, you should now see the type casts being made. Also, Tests are again back with only switches failing... Anders Johnsen <skabet@gmail.com> parents: 67 diff changeset	205 op == Operator.Ne \|\|
381975d76baf A LOT of bug fixing - also implemented implicit casts. If you do a --ast-dump-code on a target with some algebra of differant types, you should now see the type casts being made. Also, Tests are again back with only switches failing... Anders Johnsen <skabet@gmail.com> parents: 67 diff changeset	206 op == Operator.Lt \|\|
381975d76baf A LOT of bug fixing - also implemented implicit casts. If you do a --ast-dump-code on a target with some algebra of differant types, you should now see the type casts being made. Also, Tests are again back with only switches failing... Anders Johnsen <skabet@gmail.com> parents: 67 diff changeset	207 op == Operator.Le \|\|
381975d76baf A LOT of bug fixing - also implemented implicit casts. If you do a --ast-dump-code on a target with some algebra of differant types, you should now see the type casts being made. Also, Tests are again back with only switches failing... Anders Johnsen <skabet@gmail.com> parents: 67 diff changeset	208 op == Operator.Gt \|\|
381975d76baf A LOT of bug fixing - also implemented implicit casts. If you do a --ast-dump-code on a target with some algebra of differant types, you should now see the type casts being made. Also, Tests are again back with only switches failing... Anders Johnsen <skabet@gmail.com> parents: 67 diff changeset	209 op == Operator.Ge)
381975d76baf A LOT of bug fixing - also implemented implicit casts. If you do a --ast-dump-code on a target with some algebra of differant types, you should now see the type casts being made. Also, Tests are again back with only switches failing... Anders Johnsen <skabet@gmail.com> parents: 67 diff changeset	210 {
381975d76baf A LOT of bug fixing - also implemented implicit casts. If you do a --ast-dump-code on a target with some algebra of differant types, you should now see the type casts being made. Also, Tests are again back with only switches failing... Anders Johnsen <skabet@gmail.com> parents: 67 diff changeset	211 myType = DType.Bool;
381975d76baf A LOT of bug fixing - also implemented implicit casts. If you do a --ast-dump-code on a target with some algebra of differant types, you should now see the type casts being made. Also, Tests are again back with only switches failing... Anders Johnsen <skabet@gmail.com> parents: 67 diff changeset	212 return myType;
381975d76baf A LOT of bug fixing - also implemented implicit casts. If you do a --ast-dump-code on a target with some algebra of differant types, you should now see the type casts being made. Also, Tests are again back with only switches failing... Anders Johnsen <skabet@gmail.com> parents: 67 diff changeset	213 }
381975d76baf A LOT of bug fixing - also implemented implicit casts. If you do a --ast-dump-code on a target with some algebra of differant types, you should now see the type casts being made. Also, Tests are again back with only switches failing... Anders Johnsen <skabet@gmail.com> parents: 67 diff changeset	214
58 fc62c5296a1c Add types to our Exp Anders Halager <halager@gmail.com> parents: 56 diff changeset	215 DType l = left.type;
fc62c5296a1c Add types to our Exp Anders Halager <halager@gmail.com> parents: 56 diff changeset	216 DType r = right.type;
fc62c5296a1c Add types to our Exp Anders Halager <halager@gmail.com> parents: 56 diff changeset	217 if (l is r)
fc62c5296a1c Add types to our Exp Anders Halager <halager@gmail.com> parents: 56 diff changeset	218 myType = l;
fc62c5296a1c Add types to our Exp Anders Halager <halager@gmail.com> parents: 56 diff changeset	219 else if (l.hasImplicitConversionTo(r))
fc62c5296a1c Add types to our Exp Anders Halager <halager@gmail.com> parents: 56 diff changeset	220 myType = r;
fc62c5296a1c Add types to our Exp Anders Halager <halager@gmail.com> parents: 56 diff changeset	221 else if (r.hasImplicitConversionTo(l))
fc62c5296a1c Add types to our Exp Anders Halager <halager@gmail.com> parents: 56 diff changeset	222 myType = l;
fc62c5296a1c Add types to our Exp Anders Halager <halager@gmail.com> parents: 56 diff changeset	223 else
fc62c5296a1c Add types to our Exp Anders Halager <halager@gmail.com> parents: 56 diff changeset	224 return null;
68 381975d76baf A LOT of bug fixing - also implemented implicit casts. If you do a --ast-dump-code on a target with some algebra of differant types, you should now see the type casts being made. Also, Tests are again back with only switches failing... Anders Johnsen <skabet@gmail.com> parents: 67 diff changeset	225 return myType;
58 fc62c5296a1c Add types to our Exp Anders Halager <halager@gmail.com> parents: 56 diff changeset	226 }
fc62c5296a1c Add types to our Exp Anders Halager <halager@gmail.com> parents: 56 diff changeset	227
88 eb5b2c719a39 Major change to locations, tokens and expressions. Anders Halager <halager@gmail.com> parents: 86 diff changeset	228 override SLoc startLoc() { return left.startLoc(); }
eb5b2c719a39 Major change to locations, tokens and expressions. Anders Halager <halager@gmail.com> parents: 86 diff changeset	229
eb5b2c719a39 Major change to locations, tokens and expressions. Anders Halager <halager@gmail.com> parents: 86 diff changeset	230 override SourceRange sourceRange()
eb5b2c719a39 Major change to locations, tokens and expressions. Anders Halager <halager@gmail.com> parents: 86 diff changeset	231 {
eb5b2c719a39 Major change to locations, tokens and expressions. Anders Halager <halager@gmail.com> parents: 86 diff changeset	232 return left.sourceRange + right.sourceRange;
eb5b2c719a39 Major change to locations, tokens and expressions. Anders Halager <halager@gmail.com> parents: 86 diff changeset	233 }
eb5b2c719a39 Major change to locations, tokens and expressions. Anders Halager <halager@gmail.com> parents: 86 diff changeset	234
7 2ce5209f1954 Starting to work on bool support, for now == works Anders Halager <halager@gmail.com> parents: 1 diff changeset	235 char[] resultType()
2ce5209f1954 Starting to work on bool support, for now == works Anders Halager <halager@gmail.com> parents: 1 diff changeset	236 {
10 2f493057cf17 Some support for the rest of the boolean operators Anders Halager <halager@gmail.com> parents: 7 diff changeset	237 if (op >= Operator.Eq && op <= Operator.Ge)
7 2ce5209f1954 Starting to work on bool support, for now == works Anders Halager <halager@gmail.com> parents: 1 diff changeset	238 return "bool";
2ce5209f1954 Starting to work on bool support, for now == works Anders Halager <halager@gmail.com> parents: 1 diff changeset	239 return null;
2ce5209f1954 Starting to work on bool support, for now == works Anders Halager <halager@gmail.com> parents: 1 diff changeset	240 }
88 eb5b2c719a39 Major change to locations, tokens and expressions. Anders Halager <halager@gmail.com> parents: 86 diff changeset	241
139 a22e3663de89 Fixed up our simplify functions Anders Halager <halager@gmail.com> parents: 136 diff changeset	242 override BinaryExp simplify()
56 4ae365eff712 Now return types works for structs... Also, simplyfing in AST have been startet - but still messy. This update is a little messy... Anders Johnsen <skabet@gmail.com> parents: 55 diff changeset	243 {
139 a22e3663de89 Fixed up our simplify functions Anders Halager <halager@gmail.com> parents: 136 diff changeset	244 left = left.simplify();
a22e3663de89 Fixed up our simplify functions Anders Halager <halager@gmail.com> parents: 136 diff changeset	245 right = right.simplify();
56 4ae365eff712 Now return types works for structs... Also, simplyfing in AST have been startet - but still messy. This update is a little messy... Anders Johnsen <skabet@gmail.com> parents: 55 diff changeset	246 return this;
4ae365eff712 Now return types works for structs... Also, simplyfing in AST have been startet - but still messy. This update is a little messy... Anders Johnsen <skabet@gmail.com> parents: 55 diff changeset	247 }
7 2ce5209f1954 Starting to work on bool support, for now == works Anders Halager <halager@gmail.com> parents: 1 diff changeset	248
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	249 Operator op;
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	250 Exp left, right;
58 fc62c5296a1c Add types to our Exp Anders Halager <halager@gmail.com> parents: 56 diff changeset	251 private DType myType;
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	252 }
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	253
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	254 class NegateExp : Exp
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	255 {
88 eb5b2c719a39 Major change to locations, tokens and expressions. Anders Halager <halager@gmail.com> parents: 86 diff changeset	256 this(SLoc op, Exp exp)
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	257 {
88 eb5b2c719a39 Major change to locations, tokens and expressions. Anders Halager <halager@gmail.com> parents: 86 diff changeset	258 super(ExpType.Negate, op);
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	259 this.exp = exp;
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	260 }
78 ad956143dcdc Parse and gen for dereferences Anders Halager <halager@gmail.com> parents: 72 diff changeset	261
139 a22e3663de89 Fixed up our simplify functions Anders Halager <halager@gmail.com> parents: 136 diff changeset	262 override NegateExp simplify()
78 ad956143dcdc Parse and gen for dereferences Anders Halager <halager@gmail.com> parents: 72 diff changeset	263 {
139 a22e3663de89 Fixed up our simplify functions Anders Halager <halager@gmail.com> parents: 136 diff changeset	264 exp = exp.simplify();
78 ad956143dcdc Parse and gen for dereferences Anders Halager <halager@gmail.com> parents: 72 diff changeset	265 return this;
ad956143dcdc Parse and gen for dereferences Anders Halager <halager@gmail.com> parents: 72 diff changeset	266 }
ad956143dcdc Parse and gen for dereferences Anders Halager <halager@gmail.com> parents: 72 diff changeset	267
ad956143dcdc Parse and gen for dereferences Anders Halager <halager@gmail.com> parents: 72 diff changeset	268 override DType type() { return exp.type(); }
ad956143dcdc Parse and gen for dereferences Anders Halager <halager@gmail.com> parents: 72 diff changeset	269
88 eb5b2c719a39 Major change to locations, tokens and expressions. Anders Halager <halager@gmail.com> parents: 86 diff changeset	270 override SourceRange sourceRange()
eb5b2c719a39 Major change to locations, tokens and expressions. Anders Halager <halager@gmail.com> parents: 86 diff changeset	271 {
eb5b2c719a39 Major change to locations, tokens and expressions. Anders Halager <halager@gmail.com> parents: 86 diff changeset	272 return SourceRange(loc) + exp.sourceRange;
eb5b2c719a39 Major change to locations, tokens and expressions. Anders Halager <halager@gmail.com> parents: 86 diff changeset	273 }
eb5b2c719a39 Major change to locations, tokens and expressions. Anders Halager <halager@gmail.com> parents: 86 diff changeset	274
78 ad956143dcdc Parse and gen for dereferences Anders Halager <halager@gmail.com> parents: 72 diff changeset	275 public Exp exp;
ad956143dcdc Parse and gen for dereferences Anders Halager <halager@gmail.com> parents: 72 diff changeset	276 }
ad956143dcdc Parse and gen for dereferences Anders Halager <halager@gmail.com> parents: 72 diff changeset	277
ad956143dcdc Parse and gen for dereferences Anders Halager <halager@gmail.com> parents: 72 diff changeset	278 class DerefExp : Exp
ad956143dcdc Parse and gen for dereferences Anders Halager <halager@gmail.com> parents: 72 diff changeset	279 {
88 eb5b2c719a39 Major change to locations, tokens and expressions. Anders Halager <halager@gmail.com> parents: 86 diff changeset	280 this(SLoc op, Exp exp)
78 ad956143dcdc Parse and gen for dereferences Anders Halager <halager@gmail.com> parents: 72 diff changeset	281 {
88 eb5b2c719a39 Major change to locations, tokens and expressions. Anders Halager <halager@gmail.com> parents: 86 diff changeset	282 super(ExpType.Deref, op);
78 ad956143dcdc Parse and gen for dereferences Anders Halager <halager@gmail.com> parents: 72 diff changeset	283 this.exp = exp;
ad956143dcdc Parse and gen for dereferences Anders Halager <halager@gmail.com> parents: 72 diff changeset	284 }
ad956143dcdc Parse and gen for dereferences Anders Halager <halager@gmail.com> parents: 72 diff changeset	285
139 a22e3663de89 Fixed up our simplify functions Anders Halager <halager@gmail.com> parents: 136 diff changeset	286 override DerefExp simplify()
56 4ae365eff712 Now return types works for structs... Also, simplyfing in AST have been startet - but still messy. This update is a little messy... Anders Johnsen <skabet@gmail.com> parents: 55 diff changeset	287 {
139 a22e3663de89 Fixed up our simplify functions Anders Halager <halager@gmail.com> parents: 136 diff changeset	288 exp = exp.simplify();
56 4ae365eff712 Now return types works for structs... Also, simplyfing in AST have been startet - but still messy. This update is a little messy... Anders Johnsen <skabet@gmail.com> parents: 55 diff changeset	289 return this;
4ae365eff712 Now return types works for structs... Also, simplyfing in AST have been startet - but still messy. This update is a little messy... Anders Johnsen <skabet@gmail.com> parents: 55 diff changeset	290 }
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	291
80 682e20aa224f Pointers working now - big YAY Anders Johnsen <skabet@gmail.com> parents: 79 diff changeset	292 override DType type()
107 189c049cbfcc Cleanup of codegen, better support for operators a few bugfixes Anders Halager <halager@gmail.com> parents: 98 diff changeset	293 {
129 ed815b31479b Added a Symbol Anders Halager <halager@gmail.com> parents: 126 diff changeset	294 return exp.type().asPointer().pointerOf;
80 682e20aa224f Pointers working now - big YAY Anders Johnsen <skabet@gmail.com> parents: 79 diff changeset	295 }
58 fc62c5296a1c Add types to our Exp Anders Halager <halager@gmail.com> parents: 56 diff changeset	296
88 eb5b2c719a39 Major change to locations, tokens and expressions. Anders Halager <halager@gmail.com> parents: 86 diff changeset	297 override SourceRange sourceRange()
eb5b2c719a39 Major change to locations, tokens and expressions. Anders Halager <halager@gmail.com> parents: 86 diff changeset	298 {
eb5b2c719a39 Major change to locations, tokens and expressions. Anders Halager <halager@gmail.com> parents: 86 diff changeset	299 return SourceRange(loc) + exp.sourceRange;
eb5b2c719a39 Major change to locations, tokens and expressions. Anders Halager <halager@gmail.com> parents: 86 diff changeset	300 }
eb5b2c719a39 Major change to locations, tokens and expressions. Anders Halager <halager@gmail.com> parents: 86 diff changeset	301
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	302 public Exp exp;
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	303 }
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	304
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	305 class IntegerLit : Exp
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	306 {
88 eb5b2c719a39 Major change to locations, tokens and expressions. Anders Halager <halager@gmail.com> parents: 86 diff changeset	307 this(SLoc loc, char[] t)
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	308 {
88 eb5b2c719a39 Major change to locations, tokens and expressions. Anders Halager <halager@gmail.com> parents: 86 diff changeset	309 super(ExpType.IntegerLit, loc);
eb5b2c719a39 Major change to locations, tokens and expressions. Anders Halager <halager@gmail.com> parents: 86 diff changeset	310 range = SourceRange(loc, loc + t.length);
111 c658172ca8a0 Parsing basic integers and floats. Anders Johnsen <skabet@gmail.com> parents: 110 diff changeset	311 this.name = t;
67 3fdf20b08a81 Been working on the floating point parsing. Still a bit of work to do here. Anders Johnsen <skabet@gmail.com> parents: 65 diff changeset	312 }
3fdf20b08a81 Been working on the floating point parsing. Still a bit of work to do here. Anders Johnsen <skabet@gmail.com> parents: 65 diff changeset	313
3fdf20b08a81 Been working on the floating point parsing. Still a bit of work to do here. Anders Johnsen <skabet@gmail.com> parents: 65 diff changeset	314 char[] get()
3fdf20b08a81 Been working on the floating point parsing. Still a bit of work to do here. Anders Johnsen <skabet@gmail.com> parents: 65 diff changeset	315 {
3fdf20b08a81 Been working on the floating point parsing. Still a bit of work to do here. Anders Johnsen <skabet@gmail.com> parents: 65 diff changeset	316 return name;
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	317 }
88 eb5b2c719a39 Major change to locations, tokens and expressions. Anders Halager <halager@gmail.com> parents: 86 diff changeset	318
139 a22e3663de89 Fixed up our simplify functions Anders Halager <halager@gmail.com> parents: 136 diff changeset	319 override IntegerLit simplify()
56 4ae365eff712 Now return types works for structs... Also, simplyfing in AST have been startet - but still messy. This update is a little messy... Anders Johnsen <skabet@gmail.com> parents: 55 diff changeset	320 {
4ae365eff712 Now return types works for structs... Also, simplyfing in AST have been startet - but still messy. This update is a little messy... Anders Johnsen <skabet@gmail.com> parents: 55 diff changeset	321 return this;
4ae365eff712 Now return types works for structs... Also, simplyfing in AST have been startet - but still messy. This update is a little messy... Anders Johnsen <skabet@gmail.com> parents: 55 diff changeset	322 }
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	323
119 c0b531362ca6 Non compileing commit. Work on floating points and casts Anders Johnsen <skabet@gmail.com> parents: 114 diff changeset	324 override DType type()
c0b531362ca6 Non compileing commit. Work on floating points and casts Anders Johnsen <skabet@gmail.com> parents: 114 diff changeset	325 {
c0b531362ca6 Non compileing commit. Work on floating points and casts Anders Johnsen <skabet@gmail.com> parents: 114 diff changeset	326 switch(number.type)
c0b531362ca6 Non compileing commit. Work on floating points and casts Anders Johnsen <skabet@gmail.com> parents: 114 diff changeset	327 {
c0b531362ca6 Non compileing commit. Work on floating points and casts Anders Johnsen <skabet@gmail.com> parents: 114 diff changeset	328 case NumberType.Int:
c0b531362ca6 Non compileing commit. Work on floating points and casts Anders Johnsen <skabet@gmail.com> parents: 114 diff changeset	329 return DType.Int;
c0b531362ca6 Non compileing commit. Work on floating points and casts Anders Johnsen <skabet@gmail.com> parents: 114 diff changeset	330 case NumberType.Long:
c0b531362ca6 Non compileing commit. Work on floating points and casts Anders Johnsen <skabet@gmail.com> parents: 114 diff changeset	331 return DType.Long;
c0b531362ca6 Non compileing commit. Work on floating points and casts Anders Johnsen <skabet@gmail.com> parents: 114 diff changeset	332 case NumberType.ULong:
c0b531362ca6 Non compileing commit. Work on floating points and casts Anders Johnsen <skabet@gmail.com> parents: 114 diff changeset	333 return DType.ULong;
c0b531362ca6 Non compileing commit. Work on floating points and casts Anders Johnsen <skabet@gmail.com> parents: 114 diff changeset	334 case NumberType.Double:
c0b531362ca6 Non compileing commit. Work on floating points and casts Anders Johnsen <skabet@gmail.com> parents: 114 diff changeset	335 return DType.Double;
c0b531362ca6 Non compileing commit. Work on floating points and casts Anders Johnsen <skabet@gmail.com> parents: 114 diff changeset	336 case NumberType.Real:
c0b531362ca6 Non compileing commit. Work on floating points and casts Anders Johnsen <skabet@gmail.com> parents: 114 diff changeset	337 return DType.Real;
c0b531362ca6 Non compileing commit. Work on floating points and casts Anders Johnsen <skabet@gmail.com> parents: 114 diff changeset	338 }
c0b531362ca6 Non compileing commit. Work on floating points and casts Anders Johnsen <skabet@gmail.com> parents: 114 diff changeset	339 }
58 fc62c5296a1c Add types to our Exp Anders Halager <halager@gmail.com> parents: 56 diff changeset	340
88 eb5b2c719a39 Major change to locations, tokens and expressions. Anders Halager <halager@gmail.com> parents: 86 diff changeset	341 override SourceRange sourceRange()
eb5b2c719a39 Major change to locations, tokens and expressions. Anders Halager <halager@gmail.com> parents: 86 diff changeset	342 {
eb5b2c719a39 Major change to locations, tokens and expressions. Anders Halager <halager@gmail.com> parents: 86 diff changeset	343 return range;
eb5b2c719a39 Major change to locations, tokens and expressions. Anders Halager <halager@gmail.com> parents: 86 diff changeset	344 }
68 381975d76baf A LOT of bug fixing - also implemented implicit casts. If you do a --ast-dump-code on a target with some algebra of differant types, you should now see the type casts being made. Also, Tests are again back with only switches failing... Anders Johnsen <skabet@gmail.com> parents: 67 diff changeset	345
119 c0b531362ca6 Non compileing commit. Work on floating points and casts Anders Johnsen <skabet@gmail.com> parents: 114 diff changeset	346 Number number;
c0b531362ca6 Non compileing commit. Work on floating points and casts Anders Johnsen <skabet@gmail.com> parents: 114 diff changeset	347
67 3fdf20b08a81 Been working on the floating point parsing. Still a bit of work to do here. Anders Johnsen <skabet@gmail.com> parents: 65 diff changeset	348 char[] name;
88 eb5b2c719a39 Major change to locations, tokens and expressions. Anders Halager <halager@gmail.com> parents: 86 diff changeset	349 private SourceRange range;
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	350 }
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	351
55 79cb0afafabe Now structs are somewhat useable to use. Anders Johnsen <skabet@gmail.com> parents: 48 diff changeset	352 class MemberReference : Exp
28 69464d465284 Now supporting structs - both read and write. Still a few errors though, so watch out. Anders Johnsen <skabet@gmail.com> parents: 10 diff changeset	353 {
88 eb5b2c719a39 Major change to locations, tokens and expressions. Anders Halager <halager@gmail.com> parents: 86 diff changeset	354 this(SLoc dot, Exp target, Identifier child)
28 69464d465284 Now supporting structs - both read and write. Still a few errors though, so watch out. Anders Johnsen <skabet@gmail.com> parents: 10 diff changeset	355 {
88 eb5b2c719a39 Major change to locations, tokens and expressions. Anders Halager <halager@gmail.com> parents: 86 diff changeset	356 super(ExpType.MemberReference, dot);
28 69464d465284 Now supporting structs - both read and write. Still a few errors though, so watch out. Anders Johnsen <skabet@gmail.com> parents: 10 diff changeset	357 this.target = target;
69464d465284 Now supporting structs - both read and write. Still a few errors though, so watch out. Anders Johnsen <skabet@gmail.com> parents: 10 diff changeset	358 this.child = child;
69464d465284 Now supporting structs - both read and write. Still a few errors though, so watch out. Anders Johnsen <skabet@gmail.com> parents: 10 diff changeset	359 }
88 eb5b2c719a39 Major change to locations, tokens and expressions. Anders Halager <halager@gmail.com> parents: 86 diff changeset	360
129 ed815b31479b Added a Symbol Anders Halager <halager@gmail.com> parents: 126 diff changeset	361 override char[] getFQN()
ed815b31479b Added a Symbol Anders Halager <halager@gmail.com> parents: 126 diff changeset	362 {
ed815b31479b Added a Symbol Anders Halager <halager@gmail.com> parents: 126 diff changeset	363 return getSymbol().getFQN();
ed815b31479b Added a Symbol Anders Halager <halager@gmail.com> parents: 126 diff changeset	364 }
ed815b31479b Added a Symbol Anders Halager <halager@gmail.com> parents: 126 diff changeset	365
ed815b31479b Added a Symbol Anders Halager <halager@gmail.com> parents: 126 diff changeset	366 override char[] getMangledFQN()
ed815b31479b Added a Symbol Anders Halager <halager@gmail.com> parents: 126 diff changeset	367 {
ed815b31479b Added a Symbol Anders Halager <halager@gmail.com> parents: 126 diff changeset	368 return target.type.mangle() ~ child.getMangledFQN();
ed815b31479b Added a Symbol Anders Halager <halager@gmail.com> parents: 126 diff changeset	369 }
ed815b31479b Added a Symbol Anders Halager <halager@gmail.com> parents: 126 diff changeset	370
ed815b31479b Added a Symbol Anders Halager <halager@gmail.com> parents: 126 diff changeset	371 override Symbol getSymbol()
ed815b31479b Added a Symbol Anders Halager <halager@gmail.com> parents: 126 diff changeset	372 {
ed815b31479b Added a Symbol Anders Halager <halager@gmail.com> parents: 126 diff changeset	373 auto s = target.getSymbol();
ed815b31479b Added a Symbol Anders Halager <halager@gmail.com> parents: 126 diff changeset	374 if (s !is null)
158 57b0b4464a0b Parsing "new", putting it in AST and performs some tests on it. Eg. if the contructor exists and the params matches. Anders Johnsen <skabet@gmail.com> parents: 145 diff changeset	375 return s.findMembers(child.get)[0];
129 ed815b31479b Added a Symbol Anders Halager <halager@gmail.com> parents: 126 diff changeset	376 return null;
ed815b31479b Added a Symbol Anders Halager <halager@gmail.com> parents: 126 diff changeset	377 }
ed815b31479b Added a Symbol Anders Halager <halager@gmail.com> parents: 126 diff changeset	378
139 a22e3663de89 Fixed up our simplify functions Anders Halager <halager@gmail.com> parents: 136 diff changeset	379 override MemberReference simplify()
56 4ae365eff712 Now return types works for structs... Also, simplyfing in AST have been startet - but still messy. This update is a little messy... Anders Johnsen <skabet@gmail.com> parents: 55 diff changeset	380 {
139 a22e3663de89 Fixed up our simplify functions Anders Halager <halager@gmail.com> parents: 136 diff changeset	381 target = target.simplify();
56 4ae365eff712 Now return types works for structs... Also, simplyfing in AST have been startet - but still messy. This update is a little messy... Anders Johnsen <skabet@gmail.com> parents: 55 diff changeset	382 return this;
4ae365eff712 Now return types works for structs... Also, simplyfing in AST have been startet - but still messy. This update is a little messy... Anders Johnsen <skabet@gmail.com> parents: 55 diff changeset	383 }
28 69464d465284 Now supporting structs - both read and write. Still a few errors though, so watch out. Anders Johnsen <skabet@gmail.com> parents: 10 diff changeset	384
58 fc62c5296a1c Add types to our Exp Anders Halager <halager@gmail.com> parents: 56 diff changeset	385 override DType type()
fc62c5296a1c Add types to our Exp Anders Halager <halager@gmail.com> parents: 56 diff changeset	386 {
fc62c5296a1c Add types to our Exp Anders Halager <halager@gmail.com> parents: 56 diff changeset	387 if (myType)
fc62c5296a1c Add types to our Exp Anders Halager <halager@gmail.com> parents: 56 diff changeset	388 return myType;
fc62c5296a1c Add types to our Exp Anders Halager <halager@gmail.com> parents: 56 diff changeset	389
162 0f38f1a0f06f Fixed symbol for a functions members. Anders Johnsen <skabet@gmail.com> parents: 160 diff changeset	390 if ( target.type.isStruct )
0f38f1a0f06f Fixed symbol for a functions members. Anders Johnsen <skabet@gmail.com> parents: 160 diff changeset	391 {
0f38f1a0f06f Fixed symbol for a functions members. Anders Johnsen <skabet@gmail.com> parents: 160 diff changeset	392 DStruct st = target.type.asStruct;
0f38f1a0f06f Fixed symbol for a functions members. Anders Johnsen <skabet@gmail.com> parents: 160 diff changeset	393 if (auto t = st.typeOf(child.name))
0f38f1a0f06f Fixed symbol for a functions members. Anders Johnsen <skabet@gmail.com> parents: 160 diff changeset	394 myType = t;
0f38f1a0f06f Fixed symbol for a functions members. Anders Johnsen <skabet@gmail.com> parents: 160 diff changeset	395 // else assert(0, "Referencing non-existant member");
0f38f1a0f06f Fixed symbol for a functions members. Anders Johnsen <skabet@gmail.com> parents: 160 diff changeset	396 }
0f38f1a0f06f Fixed symbol for a functions members. Anders Johnsen <skabet@gmail.com> parents: 160 diff changeset	397 else if ( target.type.isClass )
0f38f1a0f06f Fixed symbol for a functions members. Anders Johnsen <skabet@gmail.com> parents: 160 diff changeset	398 {
0f38f1a0f06f Fixed symbol for a functions members. Anders Johnsen <skabet@gmail.com> parents: 160 diff changeset	399 DClass cl = target.type.asClass;
0f38f1a0f06f Fixed symbol for a functions members. Anders Johnsen <skabet@gmail.com> parents: 160 diff changeset	400 if (auto t = cl.typeOf(child.name))
0f38f1a0f06f Fixed symbol for a functions members. Anders Johnsen <skabet@gmail.com> parents: 160 diff changeset	401 myType = t;
0f38f1a0f06f Fixed symbol for a functions members. Anders Johnsen <skabet@gmail.com> parents: 160 diff changeset	402 // else assert(0, "Referencing non-existant member");
0f38f1a0f06f Fixed symbol for a functions members. Anders Johnsen <skabet@gmail.com> parents: 160 diff changeset	403 }
0f38f1a0f06f Fixed symbol for a functions members. Anders Johnsen <skabet@gmail.com> parents: 160 diff changeset	404 else
0f38f1a0f06f Fixed symbol for a functions members. Anders Johnsen <skabet@gmail.com> parents: 160 diff changeset	405 assert(0, "Only structs and classes have members");
58 fc62c5296a1c Add types to our Exp Anders Halager <halager@gmail.com> parents: 56 diff changeset	406 // no error reporting here
68 381975d76baf A LOT of bug fixing - also implemented implicit casts. If you do a --ast-dump-code on a target with some algebra of differant types, you should now see the type casts being made. Also, Tests are again back with only switches failing... Anders Johnsen <skabet@gmail.com> parents: 67 diff changeset	407
381975d76baf A LOT of bug fixing - also implemented implicit casts. If you do a --ast-dump-code on a target with some algebra of differant types, you should now see the type casts being made. Also, Tests are again back with only switches failing... Anders Johnsen <skabet@gmail.com> parents: 67 diff changeset	408 return myType;
58 fc62c5296a1c Add types to our Exp Anders Halager <halager@gmail.com> parents: 56 diff changeset	409 }
fc62c5296a1c Add types to our Exp Anders Halager <halager@gmail.com> parents: 56 diff changeset	410
88 eb5b2c719a39 Major change to locations, tokens and expressions. Anders Halager <halager@gmail.com> parents: 86 diff changeset	411 override SLoc startLoc() { return target.startLoc(); }
eb5b2c719a39 Major change to locations, tokens and expressions. Anders Halager <halager@gmail.com> parents: 86 diff changeset	412
eb5b2c719a39 Major change to locations, tokens and expressions. Anders Halager <halager@gmail.com> parents: 86 diff changeset	413 override SourceRange sourceRange()
eb5b2c719a39 Major change to locations, tokens and expressions. Anders Halager <halager@gmail.com> parents: 86 diff changeset	414 {
eb5b2c719a39 Major change to locations, tokens and expressions. Anders Halager <halager@gmail.com> parents: 86 diff changeset	415 return target.sourceRange + child.sourceRange;
eb5b2c719a39 Major change to locations, tokens and expressions. Anders Halager <halager@gmail.com> parents: 86 diff changeset	416 }
eb5b2c719a39 Major change to locations, tokens and expressions. Anders Halager <halager@gmail.com> parents: 86 diff changeset	417
28 69464d465284 Now supporting structs - both read and write. Still a few errors though, so watch out. Anders Johnsen <skabet@gmail.com> parents: 10 diff changeset	418 Identifier child;
69464d465284 Now supporting structs - both read and write. Still a few errors though, so watch out. Anders Johnsen <skabet@gmail.com> parents: 10 diff changeset	419 Exp target;
58 fc62c5296a1c Add types to our Exp Anders Halager <halager@gmail.com> parents: 56 diff changeset	420 private DType myType;
28 69464d465284 Now supporting structs - both read and write. Still a few errors though, so watch out. Anders Johnsen <skabet@gmail.com> parents: 10 diff changeset	421 }
69464d465284 Now supporting structs - both read and write. Still a few errors though, so watch out. Anders Johnsen <skabet@gmail.com> parents: 10 diff changeset	422
83 9e90694f5da0 Parse array indexing, and allow reading from arrays Anders Halager <halager@gmail.com> parents: 81 diff changeset	423 class IndexExp : Exp
28 69464d465284 Now supporting structs - both read and write. Still a few errors though, so watch out. Anders Johnsen <skabet@gmail.com> parents: 10 diff changeset	424 {
88 eb5b2c719a39 Major change to locations, tokens and expressions. Anders Halager <halager@gmail.com> parents: 86 diff changeset	425 this(Exp target, SLoc left_bracket, Exp index, SLoc right_bracket)
28 69464d465284 Now supporting structs - both read and write. Still a few errors though, so watch out. Anders Johnsen <skabet@gmail.com> parents: 10 diff changeset	426 {
88 eb5b2c719a39 Major change to locations, tokens and expressions. Anders Halager <halager@gmail.com> parents: 86 diff changeset	427 super(ExpType.Index, target.startLoc);
28 69464d465284 Now supporting structs - both read and write. Still a few errors though, so watch out. Anders Johnsen <skabet@gmail.com> parents: 10 diff changeset	428 this.target = target;
88 eb5b2c719a39 Major change to locations, tokens and expressions. Anders Halager <halager@gmail.com> parents: 86 diff changeset	429 this.left_bracket = left_bracket;
83 9e90694f5da0 Parse array indexing, and allow reading from arrays Anders Halager <halager@gmail.com> parents: 81 diff changeset	430 this.index = index;
88 eb5b2c719a39 Major change to locations, tokens and expressions. Anders Halager <halager@gmail.com> parents: 86 diff changeset	431 this.right_bracket = right_bracket;
28 69464d465284 Now supporting structs - both read and write. Still a few errors though, so watch out. Anders Johnsen <skabet@gmail.com> parents: 10 diff changeset	432 }
69464d465284 Now supporting structs - both read and write. Still a few errors though, so watch out. Anders Johnsen <skabet@gmail.com> parents: 10 diff changeset	433
83 9e90694f5da0 Parse array indexing, and allow reading from arrays Anders Halager <halager@gmail.com> parents: 81 diff changeset	434 override DType type()
9e90694f5da0 Parse array indexing, and allow reading from arrays Anders Halager <halager@gmail.com> parents: 81 diff changeset	435 {
85 9375bd975730 Allow indexing of pointers also Anders Halager <halager@gmail.com> parents: 83 diff changeset	436 DType type = target.type();
136 2be29b296081 Lots of changes: johnsen@johnsen-laptop parents: 129 diff changeset	437 if (type.isStaticArray())
2be29b296081 Lots of changes: johnsen@johnsen-laptop parents: 129 diff changeset	438 return type.asStaticArray().arrayOf;
85 9375bd975730 Allow indexing of pointers also Anders Halager <halager@gmail.com> parents: 83 diff changeset	439 else if (type.isPointer())
9375bd975730 Allow indexing of pointers also Anders Halager <halager@gmail.com> parents: 83 diff changeset	440 return type.asPointer().pointerOf;
9375bd975730 Allow indexing of pointers also Anders Halager <halager@gmail.com> parents: 83 diff changeset	441 else assert(0, "Can only index pointers and arrays");
83 9e90694f5da0 Parse array indexing, and allow reading from arrays Anders Halager <halager@gmail.com> parents: 81 diff changeset	442 }
58 fc62c5296a1c Add types to our Exp Anders Halager <halager@gmail.com> parents: 56 diff changeset	443
88 eb5b2c719a39 Major change to locations, tokens and expressions. Anders Halager <halager@gmail.com> parents: 86 diff changeset	444 override SourceRange sourceRange()
eb5b2c719a39 Major change to locations, tokens and expressions. Anders Halager <halager@gmail.com> parents: 86 diff changeset	445 {
eb5b2c719a39 Major change to locations, tokens and expressions. Anders Halager <halager@gmail.com> parents: 86 diff changeset	446 return target.sourceRange + SourceRange(right_bracket);
eb5b2c719a39 Major change to locations, tokens and expressions. Anders Halager <halager@gmail.com> parents: 86 diff changeset	447 }
eb5b2c719a39 Major change to locations, tokens and expressions. Anders Halager <halager@gmail.com> parents: 86 diff changeset	448
139 a22e3663de89 Fixed up our simplify functions Anders Halager <halager@gmail.com> parents: 136 diff changeset	449 override IndexExp simplify()
56 4ae365eff712 Now return types works for structs... Also, simplyfing in AST have been startet - but still messy. This update is a little messy... Anders Johnsen <skabet@gmail.com> parents: 55 diff changeset	450 {
139 a22e3663de89 Fixed up our simplify functions Anders Halager <halager@gmail.com> parents: 136 diff changeset	451 target = target.simplify();
a22e3663de89 Fixed up our simplify functions Anders Halager <halager@gmail.com> parents: 136 diff changeset	452 index = index.simplify();
56 4ae365eff712 Now return types works for structs... Also, simplyfing in AST have been startet - but still messy. This update is a little messy... Anders Johnsen <skabet@gmail.com> parents: 55 diff changeset	453 return this;
4ae365eff712 Now return types works for structs... Also, simplyfing in AST have been startet - but still messy. This update is a little messy... Anders Johnsen <skabet@gmail.com> parents: 55 diff changeset	454 }
4ae365eff712 Now return types works for structs... Also, simplyfing in AST have been startet - but still messy. This update is a little messy... Anders Johnsen <skabet@gmail.com> parents: 55 diff changeset	455
28 69464d465284 Now supporting structs - both read and write. Still a few errors though, so watch out. Anders Johnsen <skabet@gmail.com> parents: 10 diff changeset	456 Exp target;
83 9e90694f5da0 Parse array indexing, and allow reading from arrays Anders Halager <halager@gmail.com> parents: 81 diff changeset	457 Exp index;
88 eb5b2c719a39 Major change to locations, tokens and expressions. Anders Halager <halager@gmail.com> parents: 86 diff changeset	458 SLoc left_bracket, right_bracket;
28 69464d465284 Now supporting structs - both read and write. Still a few errors though, so watch out. Anders Johnsen <skabet@gmail.com> parents: 10 diff changeset	459 }
69464d465284 Now supporting structs - both read and write. Still a few errors though, so watch out. Anders Johnsen <skabet@gmail.com> parents: 10 diff changeset	460
68 381975d76baf A LOT of bug fixing - also implemented implicit casts. If you do a --ast-dump-code on a target with some algebra of differant types, you should now see the type casts being made. Also, Tests are again back with only switches failing... Anders Johnsen <skabet@gmail.com> parents: 67 diff changeset	461 class CastExp : Exp
381975d76baf A LOT of bug fixing - also implemented implicit casts. If you do a --ast-dump-code on a target with some algebra of differant types, you should now see the type casts being made. Also, Tests are again back with only switches failing... Anders Johnsen <skabet@gmail.com> parents: 67 diff changeset	462 {
88 eb5b2c719a39 Major change to locations, tokens and expressions. Anders Halager <halager@gmail.com> parents: 86 diff changeset	463 this(SLoc loc, Identifier castType, Exp exp)
68 381975d76baf A LOT of bug fixing - also implemented implicit casts. If you do a --ast-dump-code on a target with some algebra of differant types, you should now see the type casts being made. Also, Tests are again back with only switches failing... Anders Johnsen <skabet@gmail.com> parents: 67 diff changeset	464 {
88 eb5b2c719a39 Major change to locations, tokens and expressions. Anders Halager <halager@gmail.com> parents: 86 diff changeset	465 super(ExpType.CastExp, loc);
68 381975d76baf A LOT of bug fixing - also implemented implicit casts. If you do a --ast-dump-code on a target with some algebra of differant types, you should now see the type casts being made. Also, Tests are again back with only switches failing... Anders Johnsen <skabet@gmail.com> parents: 67 diff changeset	466 this.castType = castType;
381975d76baf A LOT of bug fixing - also implemented implicit casts. If you do a --ast-dump-code on a target with some algebra of differant types, you should now see the type casts being made. Also, Tests are again back with only switches failing... Anders Johnsen <skabet@gmail.com> parents: 67 diff changeset	467 this.exp = exp;
381975d76baf A LOT of bug fixing - also implemented implicit casts. If you do a --ast-dump-code on a target with some algebra of differant types, you should now see the type casts being made. Also, Tests are again back with only switches failing... Anders Johnsen <skabet@gmail.com> parents: 67 diff changeset	468 }
381975d76baf A LOT of bug fixing - also implemented implicit casts. If you do a --ast-dump-code on a target with some algebra of differant types, you should now see the type casts being made. Also, Tests are again back with only switches failing... Anders Johnsen <skabet@gmail.com> parents: 67 diff changeset	469
381975d76baf A LOT of bug fixing - also implemented implicit casts. If you do a --ast-dump-code on a target with some algebra of differant types, you should now see the type casts being made. Also, Tests are again back with only switches failing... Anders Johnsen <skabet@gmail.com> parents: 67 diff changeset	470 override DType type()
381975d76baf A LOT of bug fixing - also implemented implicit casts. If you do a --ast-dump-code on a target with some algebra of differant types, you should now see the type casts being made. Also, Tests are again back with only switches failing... Anders Johnsen <skabet@gmail.com> parents: 67 diff changeset	471 {
145 a14ac9e5c858 Changes Scope to use char[]'s insted of Identifiers for lookup. Anders Johnsen <skabet@gmail.com> parents: 139 diff changeset	472 return env.findType(this.castType.get);
68 381975d76baf A LOT of bug fixing - also implemented implicit casts. If you do a --ast-dump-code on a target with some algebra of differant types, you should now see the type casts being made. Also, Tests are again back with only switches failing... Anders Johnsen <skabet@gmail.com> parents: 67 diff changeset	473 }
381975d76baf A LOT of bug fixing - also implemented implicit casts. If you do a --ast-dump-code on a target with some algebra of differant types, you should now see the type casts being made. Also, Tests are again back with only switches failing... Anders Johnsen <skabet@gmail.com> parents: 67 diff changeset	474
139 a22e3663de89 Fixed up our simplify functions Anders Halager <halager@gmail.com> parents: 136 diff changeset	475 override CastExp simplify()
68 381975d76baf A LOT of bug fixing - also implemented implicit casts. If you do a --ast-dump-code on a target with some algebra of differant types, you should now see the type casts being made. Also, Tests are again back with only switches failing... Anders Johnsen <skabet@gmail.com> parents: 67 diff changeset	476 {
139 a22e3663de89 Fixed up our simplify functions Anders Halager <halager@gmail.com> parents: 136 diff changeset	477 castType = castType.simplify();
a22e3663de89 Fixed up our simplify functions Anders Halager <halager@gmail.com> parents: 136 diff changeset	478 exp = exp.simplify();
68 381975d76baf A LOT of bug fixing - also implemented implicit casts. If you do a --ast-dump-code on a target with some algebra of differant types, you should now see the type casts being made. Also, Tests are again back with only switches failing... Anders Johnsen <skabet@gmail.com> parents: 67 diff changeset	479 return this;
381975d76baf A LOT of bug fixing - also implemented implicit casts. If you do a --ast-dump-code on a target with some algebra of differant types, you should now see the type casts being made. Also, Tests are again back with only switches failing... Anders Johnsen <skabet@gmail.com> parents: 67 diff changeset	480 }
381975d76baf A LOT of bug fixing - also implemented implicit casts. If you do a --ast-dump-code on a target with some algebra of differant types, you should now see the type casts being made. Also, Tests are again back with only switches failing... Anders Johnsen <skabet@gmail.com> parents: 67 diff changeset	481
88 eb5b2c719a39 Major change to locations, tokens and expressions. Anders Halager <halager@gmail.com> parents: 86 diff changeset	482 override SourceRange sourceRange()
eb5b2c719a39 Major change to locations, tokens and expressions. Anders Halager <halager@gmail.com> parents: 86 diff changeset	483 {
eb5b2c719a39 Major change to locations, tokens and expressions. Anders Halager <halager@gmail.com> parents: 86 diff changeset	484 return SourceRange(loc) + exp.sourceRange;
eb5b2c719a39 Major change to locations, tokens and expressions. Anders Halager <halager@gmail.com> parents: 86 diff changeset	485 }
eb5b2c719a39 Major change to locations, tokens and expressions. Anders Halager <halager@gmail.com> parents: 86 diff changeset	486
68 381975d76baf A LOT of bug fixing - also implemented implicit casts. If you do a --ast-dump-code on a target with some algebra of differant types, you should now see the type casts being made. Also, Tests are again back with only switches failing... Anders Johnsen <skabet@gmail.com> parents: 67 diff changeset	487 Identifier castType;
381975d76baf A LOT of bug fixing - also implemented implicit casts. If you do a --ast-dump-code on a target with some algebra of differant types, you should now see the type casts being made. Also, Tests are again back with only switches failing... Anders Johnsen <skabet@gmail.com> parents: 67 diff changeset	488 Exp exp;
381975d76baf A LOT of bug fixing - also implemented implicit casts. If you do a --ast-dump-code on a target with some algebra of differant types, you should now see the type casts being made. Also, Tests are again back with only switches failing... Anders Johnsen <skabet@gmail.com> parents: 67 diff changeset	489 }
381975d76baf A LOT of bug fixing - also implemented implicit casts. If you do a --ast-dump-code on a target with some algebra of differant types, you should now see the type casts being made. Also, Tests are again back with only switches failing... Anders Johnsen <skabet@gmail.com> parents: 67 diff changeset	490
104 7ff4bc2accf2 Lexing more types of strings. Now all's left is to parse the string in the AST. Anders Johnsen <skabet@gmail.com> parents: 98 diff changeset	491 class StringExp : Exp
7ff4bc2accf2 Lexing more types of strings. Now all's left is to parse the string in the AST. Anders Johnsen <skabet@gmail.com> parents: 98 diff changeset	492 {
7ff4bc2accf2 Lexing more types of strings. Now all's left is to parse the string in the AST. Anders Johnsen <skabet@gmail.com> parents: 98 diff changeset	493 this(SLoc loc, char[] str)
7ff4bc2accf2 Lexing more types of strings. Now all's left is to parse the string in the AST. Anders Johnsen <skabet@gmail.com> parents: 98 diff changeset	494 {
7ff4bc2accf2 Lexing more types of strings. Now all's left is to parse the string in the AST. Anders Johnsen <skabet@gmail.com> parents: 98 diff changeset	495 super(ExpType.StringExp, loc);
7ff4bc2accf2 Lexing more types of strings. Now all's left is to parse the string in the AST. Anders Johnsen <skabet@gmail.com> parents: 98 diff changeset	496 this.str = str;
7ff4bc2accf2 Lexing more types of strings. Now all's left is to parse the string in the AST. Anders Johnsen <skabet@gmail.com> parents: 98 diff changeset	497 }
7ff4bc2accf2 Lexing more types of strings. Now all's left is to parse the string in the AST. Anders Johnsen <skabet@gmail.com> parents: 98 diff changeset	498
160 6cb2f4201e2a Improved static arrays Anders Halager <halager@gmail.com> parents: 158 diff changeset	499 override DType type() { return DType.Char.getAsStaticArray(data.length); }
110 2deb4c1f0d93 Make it compile Anders Halager <halager@gmail.com> parents: 109 diff changeset	500
104 7ff4bc2accf2 Lexing more types of strings. Now all's left is to parse the string in the AST. Anders Johnsen <skabet@gmail.com> parents: 98 diff changeset	501 char[] str;
160 6cb2f4201e2a Improved static arrays Anders Halager <halager@gmail.com> parents: 158 diff changeset	502 ubyte[] data;
104 7ff4bc2accf2 Lexing more types of strings. Now all's left is to parse the string in the AST. Anders Johnsen <skabet@gmail.com> parents: 98 diff changeset	503 }
7ff4bc2accf2 Lexing more types of strings. Now all's left is to parse the string in the AST. Anders Johnsen <skabet@gmail.com> parents: 98 diff changeset	504
158 57b0b4464a0b Parsing "new", putting it in AST and performs some tests on it. Eg. if the contructor exists and the params matches. Anders Johnsen <skabet@gmail.com> parents: 145 diff changeset	505 class NewExp : Exp
57b0b4464a0b Parsing "new", putting it in AST and performs some tests on it. Eg. if the contructor exists and the params matches. Anders Johnsen <skabet@gmail.com> parents: 145 diff changeset	506 {
57b0b4464a0b Parsing "new", putting it in AST and performs some tests on it. Eg. if the contructor exists and the params matches. Anders Johnsen <skabet@gmail.com> parents: 145 diff changeset	507 this(Identifier newType, Exp[] a_args, Exp[] c_args)
57b0b4464a0b Parsing "new", putting it in AST and performs some tests on it. Eg. if the contructor exists and the params matches. Anders Johnsen <skabet@gmail.com> parents: 145 diff changeset	508 {
57b0b4464a0b Parsing "new", putting it in AST and performs some tests on it. Eg. if the contructor exists and the params matches. Anders Johnsen <skabet@gmail.com> parents: 145 diff changeset	509 super(ExpType.NewExp, newType.loc);
57b0b4464a0b Parsing "new", putting it in AST and performs some tests on it. Eg. if the contructor exists and the params matches. Anders Johnsen <skabet@gmail.com> parents: 145 diff changeset	510 this.newType = newType;
57b0b4464a0b Parsing "new", putting it in AST and performs some tests on it. Eg. if the contructor exists and the params matches. Anders Johnsen <skabet@gmail.com> parents: 145 diff changeset	511 this.a_args = a_args;
57b0b4464a0b Parsing "new", putting it in AST and performs some tests on it. Eg. if the contructor exists and the params matches. Anders Johnsen <skabet@gmail.com> parents: 145 diff changeset	512 this.c_args = c_args;
57b0b4464a0b Parsing "new", putting it in AST and performs some tests on it. Eg. if the contructor exists and the params matches. Anders Johnsen <skabet@gmail.com> parents: 145 diff changeset	513 }
57b0b4464a0b Parsing "new", putting it in AST and performs some tests on it. Eg. if the contructor exists and the params matches. Anders Johnsen <skabet@gmail.com> parents: 145 diff changeset	514
57b0b4464a0b Parsing "new", putting it in AST and performs some tests on it. Eg. if the contructor exists and the params matches. Anders Johnsen <skabet@gmail.com> parents: 145 diff changeset	515 override DType type()
57b0b4464a0b Parsing "new", putting it in AST and performs some tests on it. Eg. if the contructor exists and the params matches. Anders Johnsen <skabet@gmail.com> parents: 145 diff changeset	516 {
57b0b4464a0b Parsing "new", putting it in AST and performs some tests on it. Eg. if the contructor exists and the params matches. Anders Johnsen <skabet@gmail.com> parents: 145 diff changeset	517 return env.findType(this.newType.get);
57b0b4464a0b Parsing "new", putting it in AST and performs some tests on it. Eg. if the contructor exists and the params matches. Anders Johnsen <skabet@gmail.com> parents: 145 diff changeset	518 }
57b0b4464a0b Parsing "new", putting it in AST and performs some tests on it. Eg. if the contructor exists and the params matches. Anders Johnsen <skabet@gmail.com> parents: 145 diff changeset	519
57b0b4464a0b Parsing "new", putting it in AST and performs some tests on it. Eg. if the contructor exists and the params matches. Anders Johnsen <skabet@gmail.com> parents: 145 diff changeset	520 Exp[] a_args, c_args;
57b0b4464a0b Parsing "new", putting it in AST and performs some tests on it. Eg. if the contructor exists and the params matches. Anders Johnsen <skabet@gmail.com> parents: 145 diff changeset	521 Identifier newType;
164 ba94fd563548 The symbol for the constructor a "new"-exp is calling is now stored in callSym in NewExp. Anders Johnsen <skabet@gmail.com> parents: 162 diff changeset	522 Symbol callSym;
158 57b0b4464a0b Parsing "new", putting it in AST and performs some tests on it. Eg. if the contructor exists and the params matches. Anders Johnsen <skabet@gmail.com> parents: 145 diff changeset	523 }
57b0b4464a0b Parsing "new", putting it in AST and performs some tests on it. Eg. if the contructor exists and the params matches. Anders Johnsen <skabet@gmail.com> parents: 145 diff changeset	524
77 13eea2c4e60d Now able of --ast-dump-code with Pointer types and also codeGen int* x; Anders Johnsen <skabet@gmail.com> parents: 72 diff changeset	525 class PointerIdentifier : Identifier
13eea2c4e60d Now able of --ast-dump-code with Pointer types and also codeGen int* x; Anders Johnsen <skabet@gmail.com> parents: 72 diff changeset	526 {
13eea2c4e60d Now able of --ast-dump-code with Pointer types and also codeGen int* x; Anders Johnsen <skabet@gmail.com> parents: 72 diff changeset	527 this(Identifier pointerOf)
13eea2c4e60d Now able of --ast-dump-code with Pointer types and also codeGen int* x; Anders Johnsen <skabet@gmail.com> parents: 72 diff changeset	528 {
88 eb5b2c719a39 Major change to locations, tokens and expressions. Anders Halager <halager@gmail.com> parents: 86 diff changeset	529 super(ExpType.PointerIdentifier, pointerOf.loc);
77 13eea2c4e60d Now able of --ast-dump-code with Pointer types and also codeGen int* x; Anders Johnsen <skabet@gmail.com> parents: 72 diff changeset	530 this.pointerOf = pointerOf;
13eea2c4e60d Now able of --ast-dump-code with Pointer types and also codeGen int* x; Anders Johnsen <skabet@gmail.com> parents: 72 diff changeset	531 this.name = pointerOf.name;
13eea2c4e60d Now able of --ast-dump-code with Pointer types and also codeGen int* x; Anders Johnsen <skabet@gmail.com> parents: 72 diff changeset	532 }
13eea2c4e60d Now able of --ast-dump-code with Pointer types and also codeGen int* x; Anders Johnsen <skabet@gmail.com> parents: 72 diff changeset	533
13eea2c4e60d Now able of --ast-dump-code with Pointer types and also codeGen int* x; Anders Johnsen <skabet@gmail.com> parents: 72 diff changeset	534 override DType type()
13eea2c4e60d Now able of --ast-dump-code with Pointer types and also codeGen int* x; Anders Johnsen <skabet@gmail.com> parents: 72 diff changeset	535 {
83 9e90694f5da0 Parse array indexing, and allow reading from arrays Anders Halager <halager@gmail.com> parents: 81 diff changeset	536 return pointerOf.type.getPointerTo();
77 13eea2c4e60d Now able of --ast-dump-code with Pointer types and also codeGen int* x; Anders Johnsen <skabet@gmail.com> parents: 72 diff changeset	537 }
13eea2c4e60d Now able of --ast-dump-code with Pointer types and also codeGen int* x; Anders Johnsen <skabet@gmail.com> parents: 72 diff changeset	538
13eea2c4e60d Now able of --ast-dump-code with Pointer types and also codeGen int* x; Anders Johnsen <skabet@gmail.com> parents: 72 diff changeset	539 Identifier pointerOf;
13eea2c4e60d Now able of --ast-dump-code with Pointer types and also codeGen int* x; Anders Johnsen <skabet@gmail.com> parents: 72 diff changeset	540 }
13eea2c4e60d Now able of --ast-dump-code with Pointer types and also codeGen int* x; Anders Johnsen <skabet@gmail.com> parents: 72 diff changeset	541
136 2be29b296081 Lots of changes: johnsen@johnsen-laptop parents: 129 diff changeset	542 class StaticArrayIdentifier : Identifier
72 628cb46ab13b First update on the way to Arrays! :) Anders Johnsen <skabet@gmail.com> parents: 68 diff changeset	543 {
81 110c7e1c4ca2 Now you can declare array Anders Johnsen <skabet@gmail.com> parents: 80 diff changeset	544 this(Identifier arrayOf, IntegerLit size)
72 628cb46ab13b First update on the way to Arrays! :) Anders Johnsen <skabet@gmail.com> parents: 68 diff changeset	545 {
136 2be29b296081 Lots of changes: johnsen@johnsen-laptop parents: 129 diff changeset	546 super(ExpType.StaticArrayIdentifier, arrayOf.loc);
72 628cb46ab13b First update on the way to Arrays! :) Anders Johnsen <skabet@gmail.com> parents: 68 diff changeset	547 this.arrayOf = arrayOf;
81 110c7e1c4ca2 Now you can declare array Anders Johnsen <skabet@gmail.com> parents: 80 diff changeset	548 this.size = Integer.parse(size.get);
110c7e1c4ca2 Now you can declare array Anders Johnsen <skabet@gmail.com> parents: 80 diff changeset	549 this.name = arrayOf.name;
72 628cb46ab13b First update on the way to Arrays! :) Anders Johnsen <skabet@gmail.com> parents: 68 diff changeset	550 }
628cb46ab13b First update on the way to Arrays! :) Anders Johnsen <skabet@gmail.com> parents: 68 diff changeset	551
628cb46ab13b First update on the way to Arrays! :) Anders Johnsen <skabet@gmail.com> parents: 68 diff changeset	552 override DType type()
628cb46ab13b First update on the way to Arrays! :) Anders Johnsen <skabet@gmail.com> parents: 68 diff changeset	553 {
136 2be29b296081 Lots of changes: johnsen@johnsen-laptop parents: 129 diff changeset	554 return arrayOf.type.getAsStaticArray(size);
72 628cb46ab13b First update on the way to Arrays! :) Anders Johnsen <skabet@gmail.com> parents: 68 diff changeset	555 }
628cb46ab13b First update on the way to Arrays! :) Anders Johnsen <skabet@gmail.com> parents: 68 diff changeset	556
628cb46ab13b First update on the way to Arrays! :) Anders Johnsen <skabet@gmail.com> parents: 68 diff changeset	557 Identifier arrayOf;
81 110c7e1c4ca2 Now you can declare array Anders Johnsen <skabet@gmail.com> parents: 80 diff changeset	558 int size;
72 628cb46ab13b First update on the way to Arrays! :) Anders Johnsen <skabet@gmail.com> parents: 68 diff changeset	559
628cb46ab13b First update on the way to Arrays! :) Anders Johnsen <skabet@gmail.com> parents: 68 diff changeset	560 private DType myType;
628cb46ab13b First update on the way to Arrays! :) Anders Johnsen <skabet@gmail.com> parents: 68 diff changeset	561 }
628cb46ab13b First update on the way to Arrays! :) Anders Johnsen <skabet@gmail.com> parents: 68 diff changeset	562
136 2be29b296081 Lots of changes: johnsen@johnsen-laptop parents: 129 diff changeset	563 class ArrayIdentifier : Identifier
2be29b296081 Lots of changes: johnsen@johnsen-laptop parents: 129 diff changeset	564 {
2be29b296081 Lots of changes: johnsen@johnsen-laptop parents: 129 diff changeset	565 this(Identifier arrayOf)
2be29b296081 Lots of changes: johnsen@johnsen-laptop parents: 129 diff changeset	566 {
2be29b296081 Lots of changes: johnsen@johnsen-laptop parents: 129 diff changeset	567 super(ExpType.ArrayIdentifier, arrayOf.loc);
2be29b296081 Lots of changes: johnsen@johnsen-laptop parents: 129 diff changeset	568 this.arrayOf = arrayOf;
2be29b296081 Lots of changes: johnsen@johnsen-laptop parents: 129 diff changeset	569 this.name = arrayOf.name;
2be29b296081 Lots of changes: johnsen@johnsen-laptop parents: 129 diff changeset	570 }
2be29b296081 Lots of changes: johnsen@johnsen-laptop parents: 129 diff changeset	571
2be29b296081 Lots of changes: johnsen@johnsen-laptop parents: 129 diff changeset	572 override DType type()
2be29b296081 Lots of changes: johnsen@johnsen-laptop parents: 129 diff changeset	573 {
2be29b296081 Lots of changes: johnsen@johnsen-laptop parents: 129 diff changeset	574 return arrayOf.type.getAsArray();
2be29b296081 Lots of changes: johnsen@johnsen-laptop parents: 129 diff changeset	575 }
2be29b296081 Lots of changes: johnsen@johnsen-laptop parents: 129 diff changeset	576
2be29b296081 Lots of changes: johnsen@johnsen-laptop parents: 129 diff changeset	577 Identifier arrayOf;
2be29b296081 Lots of changes: johnsen@johnsen-laptop parents: 129 diff changeset	578
2be29b296081 Lots of changes: johnsen@johnsen-laptop parents: 129 diff changeset	579 private DType myType;
2be29b296081 Lots of changes: johnsen@johnsen-laptop parents: 129 diff changeset	580 }
2be29b296081 Lots of changes: johnsen@johnsen-laptop parents: 129 diff changeset	581
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	582 class Identifier : Exp
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	583 {
88 eb5b2c719a39 Major change to locations, tokens and expressions. Anders Halager <halager@gmail.com> parents: 86 diff changeset	584 this(SLoc loc, char[] name)
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	585 {
88 eb5b2c719a39 Major change to locations, tokens and expressions. Anders Halager <halager@gmail.com> parents: 86 diff changeset	586 super(ExpType.Identifier, loc);
eb5b2c719a39 Major change to locations, tokens and expressions. Anders Halager <halager@gmail.com> parents: 86 diff changeset	587 this.name = name;
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	588 }
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	589
88 eb5b2c719a39 Major change to locations, tokens and expressions. Anders Halager <halager@gmail.com> parents: 86 diff changeset	590 protected this(ExpType t, SLoc loc)
72 628cb46ab13b First update on the way to Arrays! :) Anders Johnsen <skabet@gmail.com> parents: 68 diff changeset	591 {
88 eb5b2c719a39 Major change to locations, tokens and expressions. Anders Halager <halager@gmail.com> parents: 86 diff changeset	592 super(t, loc);
72 628cb46ab13b First update on the way to Arrays! :) Anders Johnsen <skabet@gmail.com> parents: 68 diff changeset	593 }
628cb46ab13b First update on the way to Arrays! :) Anders Johnsen <skabet@gmail.com> parents: 68 diff changeset	594
129 ed815b31479b Added a Symbol Anders Halager <halager@gmail.com> parents: 126 diff changeset	595 override char[] getFQN()
ed815b31479b Added a Symbol Anders Halager <halager@gmail.com> parents: 126 diff changeset	596 {
ed815b31479b Added a Symbol Anders Halager <halager@gmail.com> parents: 126 diff changeset	597 return name;
ed815b31479b Added a Symbol Anders Halager <halager@gmail.com> parents: 126 diff changeset	598 }
ed815b31479b Added a Symbol Anders Halager <halager@gmail.com> parents: 126 diff changeset	599
ed815b31479b Added a Symbol Anders Halager <halager@gmail.com> parents: 126 diff changeset	600 override char[] getMangledFQN()
ed815b31479b Added a Symbol Anders Halager <halager@gmail.com> parents: 126 diff changeset	601 {
ed815b31479b Added a Symbol Anders Halager <halager@gmail.com> parents: 126 diff changeset	602 return Integer.toString(name.length) ~ name;
ed815b31479b Added a Symbol Anders Halager <halager@gmail.com> parents: 126 diff changeset	603 }
ed815b31479b Added a Symbol Anders Halager <halager@gmail.com> parents: 126 diff changeset	604
ed815b31479b Added a Symbol Anders Halager <halager@gmail.com> parents: 126 diff changeset	605 override Symbol getSymbol()
ed815b31479b Added a Symbol Anders Halager <halager@gmail.com> parents: 126 diff changeset	606 {
145 a14ac9e5c858 Changes Scope to use char[]'s insted of Identifiers for lookup. Anders Johnsen <skabet@gmail.com> parents: 139 diff changeset	607 if (auto decl = env.find(this.get))
129 ed815b31479b Added a Symbol Anders Halager <halager@gmail.com> parents: 126 diff changeset	608 return decl.sym;
ed815b31479b Added a Symbol Anders Halager <halager@gmail.com> parents: 126 diff changeset	609 else
ed815b31479b Added a Symbol Anders Halager <halager@gmail.com> parents: 126 diff changeset	610 return null;
ed815b31479b Added a Symbol Anders Halager <halager@gmail.com> parents: 126 diff changeset	611 }
ed815b31479b Added a Symbol Anders Halager <halager@gmail.com> parents: 126 diff changeset	612
58 fc62c5296a1c Add types to our Exp Anders Halager <halager@gmail.com> parents: 56 diff changeset	613 override DType type()
fc62c5296a1c Add types to our Exp Anders Halager <halager@gmail.com> parents: 56 diff changeset	614 {
59 1d6f4ad38a91 Make most of the tests pass again Anders Halager <halager@gmail.com> parents: 58 diff changeset	615 if (myType !is null)
58 fc62c5296a1c Add types to our Exp Anders Halager <halager@gmail.com> parents: 56 diff changeset	616 return myType;
129 ed815b31479b Added a Symbol Anders Halager <halager@gmail.com> parents: 126 diff changeset	617 else if (auto sym = getSymbol)
ed815b31479b Added a Symbol Anders Halager <halager@gmail.com> parents: 126 diff changeset	618 myType = sym.type;
114 3a0cd42de9cc Removed misc/Error.d and is now using the error system all way through. Anders Johnsen <skabet@gmail.com> parents: 111 diff changeset	619 else
3a0cd42de9cc Removed misc/Error.d and is now using the error system all way through. Anders Johnsen <skabet@gmail.com> parents: 111 diff changeset	620 myType = DType.Int;
129 ed815b31479b Added a Symbol Anders Halager <halager@gmail.com> parents: 126 diff changeset	621
58 fc62c5296a1c Add types to our Exp Anders Halager <halager@gmail.com> parents: 56 diff changeset	622 return myType;
fc62c5296a1c Add types to our Exp Anders Halager <halager@gmail.com> parents: 56 diff changeset	623 }
fc62c5296a1c Add types to our Exp Anders Halager <halager@gmail.com> parents: 56 diff changeset	624
56 4ae365eff712 Now return types works for structs... Also, simplyfing in AST have been startet - but still messy. This update is a little messy... Anders Johnsen <skabet@gmail.com> parents: 55 diff changeset	625 this(char[] name)
4ae365eff712 Now return types works for structs... Also, simplyfing in AST have been startet - but still messy. This update is a little messy... Anders Johnsen <skabet@gmail.com> parents: 55 diff changeset	626 {
88 eb5b2c719a39 Major change to locations, tokens and expressions. Anders Halager <halager@gmail.com> parents: 86 diff changeset	627 super(ExpType.Identifier, SLoc.Invalid);
56 4ae365eff712 Now return types works for structs... Also, simplyfing in AST have been startet - but still messy. This update is a little messy... Anders Johnsen <skabet@gmail.com> parents: 55 diff changeset	628 this.name = name;
4ae365eff712 Now return types works for structs... Also, simplyfing in AST have been startet - but still messy. This update is a little messy... Anders Johnsen <skabet@gmail.com> parents: 55 diff changeset	629 }
4ae365eff712 Now return types works for structs... Also, simplyfing in AST have been startet - but still messy. This update is a little messy... Anders Johnsen <skabet@gmail.com> parents: 55 diff changeset	630
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	631 char[] get()
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	632 {
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	633 return name;
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	634 }
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	635
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	636 hash_t toHash()
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	637 {
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	638 return jhash(name);
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	639 }
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	640
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	641 int opCmp(Object o)
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	642 {
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	643 if (auto id = cast(Identifier)o)
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	644 return typeid(char[]).compare(&name, &id.name);
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	645 return 0;
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	646 }
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	647
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	648 int opEquals(Object o)
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	649 {
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	650 if (auto id = cast(Identifier)o)
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	651 return typeid(char[]).equals(&name, &id.name);
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	652 return 0;
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	653 }
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	654
139 a22e3663de89 Fixed up our simplify functions Anders Halager <halager@gmail.com> parents: 136 diff changeset	655 override Identifier simplify()
56 4ae365eff712 Now return types works for structs... Also, simplyfing in AST have been startet - but still messy. This update is a little messy... Anders Johnsen <skabet@gmail.com> parents: 55 diff changeset	656 {
4ae365eff712 Now return types works for structs... Also, simplyfing in AST have been startet - but still messy. This update is a little messy... Anders Johnsen <skabet@gmail.com> parents: 55 diff changeset	657 return this;
4ae365eff712 Now return types works for structs... Also, simplyfing in AST have been startet - but still messy. This update is a little messy... Anders Johnsen <skabet@gmail.com> parents: 55 diff changeset	658 }
4ae365eff712 Now return types works for structs... Also, simplyfing in AST have been startet - but still messy. This update is a little messy... Anders Johnsen <skabet@gmail.com> parents: 55 diff changeset	659
93 621cedba53ea Removed the Symbol from semantics - it was not needed anymore. From now on you set the type by doing a setType on an Identifier. Anders Johnsen <skabet@gmail.com> parents: 92 diff changeset	660 void setType(DType myType)
621cedba53ea Removed the Symbol from semantics - it was not needed anymore. From now on you set the type by doing a setType on an Identifier. Anders Johnsen <skabet@gmail.com> parents: 92 diff changeset	661 {
621cedba53ea Removed the Symbol from semantics - it was not needed anymore. From now on you set the type by doing a setType on an Identifier. Anders Johnsen <skabet@gmail.com> parents: 92 diff changeset	662 this.myType = myType;
621cedba53ea Removed the Symbol from semantics - it was not needed anymore. From now on you set the type by doing a setType on an Identifier. Anders Johnsen <skabet@gmail.com> parents: 92 diff changeset	663 }
621cedba53ea Removed the Symbol from semantics - it was not needed anymore. From now on you set the type by doing a setType on an Identifier. Anders Johnsen <skabet@gmail.com> parents: 92 diff changeset	664
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	665 char[] name;
58 fc62c5296a1c Add types to our Exp Anders Halager <halager@gmail.com> parents: 56 diff changeset	666 private DType myType;
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	667 }
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	668

Mercurial > projects > dang

annotate ast/Exp.d @ 164:ba94fd563548