projects/dang: sema/ScopeBuilder.d annotate

annotate sema/ScopeBuilder.d @ 99:857f0d530789 new_gen

Imports and improved module statement Allow "module a.b.c" Supports most forms of D's import. import A, B; import A, B = C; import A, B : a = b, c;

author	Anders Halager <halager@gmail.com>
date	Tue, 06 May 2008 21:59:22 +0200
parents	48bb2287c035
children	fea8d61a2451

rev	line source
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: 86 diff changeset	1 module sema.ScopeBuilder;
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	2
14 a51bdf15a33d Better scopes. Anders Halager <halager@gmail.com> parents: 11 diff changeset	3 import tango.io.Stdout,
a51bdf15a33d Better scopes. Anders Halager <halager@gmail.com> parents: 11 diff changeset	4 tango.core.Array : find;
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	5
26 b4dc2b2c0e38 Added a DType class Anders Halager <halager@gmail.com> parents: 24 diff changeset	6 public
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: 86 diff changeset	7 import sema.Scope;
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	8
59 1d6f4ad38a91 Make most of the tests pass again Anders Halager <halager@gmail.com> parents: 56 diff changeset	9 import sema.Visitor,
1d6f4ad38a91 Make most of the tests pass again Anders Halager <halager@gmail.com> parents: 56 diff changeset	10 basic.SmallArray;
1 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: 86 diff changeset	12 class ForwardReference : Visitor!(void)
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	13 {
53 da551f90e03f Added struct decl and forward ref. A note on structs: they need to make a new scope when declared. Otherwise you could access struct members as globals Anders Johnsen <skabet@gmail.com> parents: 45 diff changeset	14 override void visitFuncDecl(FuncDecl d)
da551f90e03f Added struct decl and forward ref. A note on structs: they need to make a new scope when declared. Otherwise you could access struct members as globals Anders Johnsen <skabet@gmail.com> parents: 45 diff changeset	15 {
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: 59 diff changeset	16 visitExp(d.returnType);
53 da551f90e03f Added struct decl and forward ref. A note on structs: they need to make a new scope when declared. Otherwise you could access struct members as globals Anders Johnsen <skabet@gmail.com> parents: 45 diff changeset	17 visitExp(d.identifier);
da551f90e03f Added struct decl and forward ref. A note on structs: they need to make a new scope when declared. Otherwise you could access struct members as globals Anders Johnsen <skabet@gmail.com> parents: 45 diff changeset	18 foreach (arg; d.funcArgs)
da551f90e03f Added struct decl and forward ref. A note on structs: they need to make a new scope when declared. Otherwise you could access struct members as globals Anders Johnsen <skabet@gmail.com> parents: 45 diff changeset	19 visitDecl(arg);
da551f90e03f Added struct decl and forward ref. A note on structs: they need to make a new scope when declared. Otherwise you could access struct members as globals Anders Johnsen <skabet@gmail.com> parents: 45 diff changeset	20 foreach (stmt; d.statements)
da551f90e03f Added struct decl and forward ref. A note on structs: they need to make a new scope when declared. Otherwise you could access struct members as globals Anders Johnsen <skabet@gmail.com> parents: 45 diff changeset	21 visitStmt(stmt);
59 1d6f4ad38a91 Make most of the tests pass again Anders Halager <halager@gmail.com> parents: 56 diff changeset	22
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	23 d.env.find(d.identifier).setType(d.type);
53 da551f90e03f Added struct decl and forward ref. A note on structs: they need to make a new scope when declared. Otherwise you could access struct members as globals Anders Johnsen <skabet@gmail.com> parents: 45 diff changeset	24 }
da551f90e03f Added struct decl and forward ref. A note on structs: they need to make a new scope when declared. Otherwise you could access struct members as globals Anders Johnsen <skabet@gmail.com> parents: 45 diff changeset	25
da551f90e03f Added struct decl and forward ref. A note on structs: they need to make a new scope when declared. Otherwise you could access struct members as globals Anders Johnsen <skabet@gmail.com> parents: 45 diff changeset	26 override void visitVarDecl(VarDecl d)
da551f90e03f Added struct decl and forward ref. A note on structs: they need to make a new scope when declared. Otherwise you could access struct members as globals Anders Johnsen <skabet@gmail.com> parents: 45 diff changeset	27 {
82 06dda301ea61 Can declare outside functions and call c-functions Anders Johnsen <skabet@gmail.com> parents: 81 diff changeset	28 visitExp(d.varType);
86 29f486ccc203 Fixed a bug that made arrays as params fail big time Anders Johnsen <skabet@gmail.com> parents: 83 diff changeset	29 visitExp(d.identifier);
82 06dda301ea61 Can declare outside functions and call c-functions Anders Johnsen <skabet@gmail.com> parents: 81 diff changeset	30
53 da551f90e03f Added struct decl and forward ref. A note on structs: they need to make a new scope when declared. Otherwise you could access struct members as globals Anders Johnsen <skabet@gmail.com> parents: 45 diff changeset	31 if (d.init)
da551f90e03f Added struct decl and forward ref. A note on structs: they need to make a new scope when declared. Otherwise you could access struct members as globals Anders Johnsen <skabet@gmail.com> parents: 45 diff changeset	32 visitExp(d.init);
da551f90e03f Added struct decl and forward ref. A note on structs: they need to make a new scope when declared. Otherwise you could access struct members as globals Anders Johnsen <skabet@gmail.com> parents: 45 diff changeset	33
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	34 d.env.find(d.identifier).setType( typeOf(d.varType, d.env) );
53 da551f90e03f Added struct decl and forward ref. A note on structs: they need to make a new scope when declared. Otherwise you could access struct members as globals Anders Johnsen <skabet@gmail.com> parents: 45 diff changeset	35 }
da551f90e03f Added struct decl and forward ref. A note on structs: they need to make a new scope when declared. Otherwise you could access struct members as globals Anders Johnsen <skabet@gmail.com> parents: 45 diff changeset	36
da551f90e03f Added struct decl and forward ref. A note on structs: they need to make a new scope when declared. Otherwise you could access struct members as globals Anders Johnsen <skabet@gmail.com> parents: 45 diff changeset	37 override void visitStructDecl(StructDecl s)
da551f90e03f Added struct decl and forward ref. A note on structs: they need to make a new scope when declared. Otherwise you could access struct members as globals Anders Johnsen <skabet@gmail.com> parents: 45 diff changeset	38 {
da551f90e03f Added struct decl and forward ref. A note on structs: they need to make a new scope when declared. Otherwise you could access struct members as globals Anders Johnsen <skabet@gmail.com> parents: 45 diff changeset	39 DType[char[]] types;
55 79cb0afafabe Now structs are somewhat useable to use. Anders Johnsen <skabet@gmail.com> parents: 53 diff changeset	40
64 91f10c34cd7b Fixed some bugs, removed the function gathering pass in codegen and types are Anders Halager <halager@gmail.com> parents: 63 diff changeset	41 auto st = s.env.types[s.identifier.get].asStruct;
53 da551f90e03f Added struct decl and forward ref. A note on structs: they need to make a new scope when declared. Otherwise you could access struct members as globals Anders Johnsen <skabet@gmail.com> parents: 45 diff changeset	42 foreach(varDecl ; s.vars)
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: 59 diff changeset	43 st.addMember(typeOf(varDecl.varType, varDecl.env), varDecl.identifier.get);
53 da551f90e03f Added struct decl and forward ref. A note on structs: they need to make a new scope when declared. Otherwise you could access struct members as globals Anders Johnsen <skabet@gmail.com> parents: 45 diff changeset	44
da551f90e03f Added struct decl and forward ref. A note on structs: they need to make a new scope when declared. Otherwise you could access struct members as globals Anders Johnsen <skabet@gmail.com> parents: 45 diff changeset	45 super.visitStructDecl(s);
da551f90e03f Added struct decl and forward ref. A note on structs: they need to make a new scope when declared. Otherwise you could access struct members as globals Anders Johnsen <skabet@gmail.com> parents: 45 diff changeset	46 }
da551f90e03f Added struct decl and forward ref. A note on structs: they need to make a new scope when declared. Otherwise you could access struct members as globals Anders Johnsen <skabet@gmail.com> parents: 45 diff changeset	47
da551f90e03f Added struct decl and forward ref. A note on structs: they need to make a new scope when declared. Otherwise you could access struct members as globals Anders Johnsen <skabet@gmail.com> parents: 45 diff changeset	48 DType typeOf(Identifier id, Scope sc)
da551f90e03f Added struct decl and forward ref. A note on structs: they need to make a new scope when declared. Otherwise you could access struct members as globals Anders Johnsen <skabet@gmail.com> parents: 45 diff changeset	49 {
77 13eea2c4e60d Now able of --ast-dump-code with Pointer types and also codeGen int* x; Anders Johnsen <skabet@gmail.com> parents: 64 diff changeset	50 if(auto i = cast(PointerIdentifier)id)
83 9e90694f5da0 Parse array indexing, and allow reading from arrays Anders Halager <halager@gmail.com> parents: 82 diff changeset	51 return (typeOf(i.pointerOf, sc)).getPointerTo();
81 110c7e1c4ca2 Now you can declare array Anders Johnsen <skabet@gmail.com> parents: 77 diff changeset	52 if(auto i = cast(ArrayIdentifier)id)
83 9e90694f5da0 Parse array indexing, and allow reading from arrays Anders Halager <halager@gmail.com> parents: 82 diff changeset	53 return typeOf(i.arrayOf, sc).getAsArray(i.size);
53 da551f90e03f Added struct decl and forward ref. A note on structs: they need to make a new scope when declared. Otherwise you could access struct members as globals Anders Johnsen <skabet@gmail.com> parents: 45 diff changeset	54 return sc.findType(id);
da551f90e03f Added struct decl and forward ref. A note on structs: they need to make a new scope when declared. Otherwise you could access struct members as globals Anders Johnsen <skabet@gmail.com> parents: 45 diff changeset	55 }
da551f90e03f Added struct decl and forward ref. A note on structs: they need to make a new scope when declared. Otherwise you could access struct members as globals Anders Johnsen <skabet@gmail.com> parents: 45 diff changeset	56 }
da551f90e03f Added struct decl and forward ref. A note on structs: they need to make a new scope when declared. Otherwise you could access struct members as globals Anders Johnsen <skabet@gmail.com> parents: 45 diff changeset	57
da551f90e03f Added struct decl and forward ref. A note on structs: they need to make a new scope when declared. Otherwise you could access struct members as globals Anders Johnsen <skabet@gmail.com> parents: 45 diff changeset	58 class ScopeBuilder : Visitor!(void)
da551f90e03f Added struct decl and forward ref. A note on structs: they need to make a new scope when declared. Otherwise you could access struct members as globals Anders Johnsen <skabet@gmail.com> parents: 45 diff changeset	59 {
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	60 this()
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	61 {
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	62 table ~= new Scope;
28 69464d465284 Now supporting structs - both read and write. Still a few errors though, so watch out. Anders Johnsen <skabet@gmail.com> parents: 27 diff changeset	63 table[0].types["void"] = DType.Void;
69464d465284 Now supporting structs - both read and write. Still a few errors though, so watch out. Anders Johnsen <skabet@gmail.com> parents: 27 diff changeset	64 table[0].types["bool"] = DType.Bool;
69464d465284 Now supporting structs - both read and write. Still a few errors though, so watch out. Anders Johnsen <skabet@gmail.com> parents: 27 diff changeset	65 table[0].types["byte"] = DType.Byte;
69464d465284 Now supporting structs - both read and write. Still a few errors though, so watch out. Anders Johnsen <skabet@gmail.com> parents: 27 diff changeset	66 table[0].types["ubyte"] = DType.UByte;
69464d465284 Now supporting structs - both read and write. Still a few errors though, so watch out. Anders Johnsen <skabet@gmail.com> parents: 27 diff changeset	67 table[0].types["short"] = DType.Short;
69464d465284 Now supporting structs - both read and write. Still a few errors though, so watch out. Anders Johnsen <skabet@gmail.com> parents: 27 diff changeset	68 table[0].types["ushort"] = DType.UShort;
69464d465284 Now supporting structs - both read and write. Still a few errors though, so watch out. Anders Johnsen <skabet@gmail.com> parents: 27 diff changeset	69 table[0].types["int"] = DType.Int;
69464d465284 Now supporting structs - both read and write. Still a few errors though, so watch out. Anders Johnsen <skabet@gmail.com> parents: 27 diff changeset	70 table[0].types["uint"] = DType.UInt;
69464d465284 Now supporting structs - both read and write. Still a few errors though, so watch out. Anders Johnsen <skabet@gmail.com> parents: 27 diff changeset	71 table[0].types["long"] = DType.Long;
69464d465284 Now supporting structs - both read and write. Still a few errors though, so watch out. Anders Johnsen <skabet@gmail.com> parents: 27 diff changeset	72 table[0].types["ulong"] = DType.ULong;
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	73 }
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	74
94 48bb2287c035 Added Modules. Right now it's very simple - will grow with time and need. Anders Johnsen <skabet@gmail.com> parents: 93 diff changeset	75 override void visit(Module m)
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	76 {
99 857f0d530789 Imports and improved module statement Anders Halager <halager@gmail.com> parents: 94 diff changeset	77 current().inModule = m;
94 48bb2287c035 Added Modules. Right now it's very simple - will grow with time and need. Anders Johnsen <skabet@gmail.com> parents: 93 diff changeset	78 visitModule(m);
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: 86 diff changeset	79 auto fr = new ForwardReference();
94 48bb2287c035 Added Modules. Right now it's very simple - will grow with time and need. Anders Johnsen <skabet@gmail.com> parents: 93 diff changeset	80 fr.visit(m);
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	81 }
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	82
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	83 override void visitDecl(Decl d)
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	84 {
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	85 d.env = current();
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	86 super.visitDecl(d);
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	87 }
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	88
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	89 override void visitStmt(Stmt s)
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	90 {
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	91 s.env = current();
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	92 s.stmtIndex = s.env.stmtIndex;
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	93 super.visitStmt(s);
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	94 }
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	95
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	96 override void visitExp(Exp e)
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	97 {
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	98 e.env = current();
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	99 e.stmtIndex = e.env.stmtIndex;
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	100 super.visitExp(e);
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	101 }
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	102
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	103 override void visitFuncDecl(FuncDecl d)
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	104 {
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	105 current().add(d.identifier);
28 69464d465284 Now supporting structs - both read and write. Still a few errors though, so watch out. Anders Johnsen <skabet@gmail.com> parents: 27 diff changeset	106 auto sc = push();
53 da551f90e03f Added struct decl and forward ref. A note on structs: they need to make a new scope when declared. Otherwise you could access struct members as globals Anders Johnsen <skabet@gmail.com> parents: 45 diff changeset	107
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: 59 diff changeset	108 visitExp(d.returnType);
2 ae5bbe4e7fd6 Lots of stuff, here are the git comments: Anders Halager <halager@gmail.com> parents: 1 diff changeset	109 visitExp(d.identifier);
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	110 d.env = current();
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	111 sc.parentFunction = d;
2 ae5bbe4e7fd6 Lots of stuff, here are the git comments: Anders Halager <halager@gmail.com> parents: 1 diff changeset	112 foreach (arg; d.funcArgs)
ae5bbe4e7fd6 Lots of stuff, here are the git comments: Anders Halager <halager@gmail.com> parents: 1 diff changeset	113 visitDecl(arg);
ae5bbe4e7fd6 Lots of stuff, here are the git comments: Anders Halager <halager@gmail.com> parents: 1 diff changeset	114 foreach (stmt; d.statements)
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	115 {
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	116 sc.currentStmtIndex++;
2 ae5bbe4e7fd6 Lots of stuff, here are the git comments: Anders Halager <halager@gmail.com> parents: 1 diff changeset	117 visitStmt(stmt);
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 }
14 a51bdf15a33d Better scopes. Anders Halager <halager@gmail.com> parents: 11 diff changeset	119 pop(sc);
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	120 }
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	121
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	122 override void visitVarDecl(VarDecl d)
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	123 {
24 2d28b21faad6 New codegen! Anders Halager <halager@gmail.com> parents: 22 diff changeset	124 if (d.init)
2d28b21faad6 New codegen! Anders Halager <halager@gmail.com> parents: 22 diff changeset	125 visitExp(d.init);
2d28b21faad6 New codegen! Anders Halager <halager@gmail.com> parents: 22 diff changeset	126
53 da551f90e03f Added struct decl and forward ref. A note on structs: they need to make a new scope when declared. Otherwise you could access struct members as globals Anders Johnsen <skabet@gmail.com> parents: 45 diff changeset	127 if (need_push > 0 && current().parentFunction !is null) {
24 2d28b21faad6 New codegen! Anders Halager <halager@gmail.com> parents: 22 diff changeset	128 push();
2d28b21faad6 New codegen! Anders Halager <halager@gmail.com> parents: 22 diff changeset	129 --need_push;
2d28b21faad6 New codegen! Anders Halager <halager@gmail.com> parents: 22 diff changeset	130 }
2d28b21faad6 New codegen! Anders Halager <halager@gmail.com> parents: 22 diff changeset	131
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	132 auto sc = current();
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	133 sc.add(d.identifier);
24 2d28b21faad6 New codegen! Anders Halager <halager@gmail.com> parents: 22 diff changeset	134 d.env = sc;
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: 59 diff changeset	135 visitExp(d.varType);
24 2d28b21faad6 New codegen! Anders Halager <halager@gmail.com> parents: 22 diff changeset	136 visitExp(d.identifier);
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	137 }
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	138
22 e331e4e816e4 now handling structs to some extend johnsen@johnsen-laptop parents: 14 diff changeset	139 override void visitStructDecl(StructDecl s)
e331e4e816e4 now handling structs to some extend johnsen@johnsen-laptop parents: 14 diff changeset	140 {
e331e4e816e4 now handling structs to some extend johnsen@johnsen-laptop parents: 14 diff changeset	141 auto sc = current();
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	142 sc.add(s.identifier);
55 79cb0afafabe Now structs are somewhat useable to use. Anders Johnsen <skabet@gmail.com> parents: 53 diff changeset	143 s.env = sc;
79cb0afafabe Now structs are somewhat useable to use. Anders Johnsen <skabet@gmail.com> parents: 53 diff changeset	144 auto type = new DStruct(s.identifier);
28 69464d465284 Now supporting structs - both read and write. Still a few errors though, so watch out. Anders Johnsen <skabet@gmail.com> parents: 27 diff changeset	145
69464d465284 Now supporting structs - both read and write. Still a few errors though, so watch out. Anders Johnsen <skabet@gmail.com> parents: 27 diff changeset	146 sc.types[s.identifier.get] = type;
55 79cb0afafabe Now structs are somewhat useable to use. Anders Johnsen <skabet@gmail.com> parents: 53 diff changeset	147
79cb0afafabe Now structs are somewhat useable to use. Anders Johnsen <skabet@gmail.com> parents: 53 diff changeset	148 sc = push();
22 e331e4e816e4 now handling structs to some extend johnsen@johnsen-laptop parents: 14 diff changeset	149 super.visitStructDecl(s);
55 79cb0afafabe Now structs are somewhat useable to use. Anders Johnsen <skabet@gmail.com> parents: 53 diff changeset	150 pop(sc);
22 e331e4e816e4 now handling structs to some extend johnsen@johnsen-laptop parents: 14 diff changeset	151 }
e331e4e816e4 now handling structs to some extend johnsen@johnsen-laptop parents: 14 diff changeset	152
14 a51bdf15a33d Better scopes. Anders Halager <halager@gmail.com> parents: 11 diff changeset	153 override void visitDeclStmt(DeclStmt d)
a51bdf15a33d Better scopes. Anders Halager <halager@gmail.com> parents: 11 diff changeset	154 {
24 2d28b21faad6 New codegen! Anders Halager <halager@gmail.com> parents: 22 diff changeset	155 ++need_push;
14 a51bdf15a33d Better scopes. Anders Halager <halager@gmail.com> parents: 11 diff changeset	156 super.visitDeclStmt(d);
a51bdf15a33d Better scopes. Anders Halager <halager@gmail.com> parents: 11 diff changeset	157 }
24 2d28b21faad6 New codegen! Anders Halager <halager@gmail.com> parents: 22 diff changeset	158 private uint need_push = 0;
14 a51bdf15a33d Better scopes. Anders Halager <halager@gmail.com> parents: 11 diff changeset	159
11 642c6a998fd9 Support for while statements and fixed scope for if Anders Halager <halager@gmail.com> parents: 2 diff changeset	160 override void visitIfStmt(IfStmt s)
642c6a998fd9 Support for while statements and fixed scope for if Anders Halager <halager@gmail.com> parents: 2 diff changeset	161 {
642c6a998fd9 Support for while statements and fixed scope for if Anders Halager <halager@gmail.com> parents: 2 diff changeset	162 s.env = current();
642c6a998fd9 Support for while statements and fixed scope for if Anders Halager <halager@gmail.com> parents: 2 diff changeset	163 visitExp(s.cond);
14 a51bdf15a33d Better scopes. Anders Halager <halager@gmail.com> parents: 11 diff changeset	164 auto sc = push();
45 9bc660cbdbec If statements are back Anders Halager <halager@gmail.com> parents: 44 diff changeset	165 visitStmt(s.then_body);
14 a51bdf15a33d Better scopes. Anders Halager <halager@gmail.com> parents: 11 diff changeset	166 pop(sc);
11 642c6a998fd9 Support for while statements and fixed scope for if Anders Halager <halager@gmail.com> parents: 2 diff changeset	167
45 9bc660cbdbec If statements are back Anders Halager <halager@gmail.com> parents: 44 diff changeset	168 if (s.else_body !is null)
9bc660cbdbec If statements are back Anders Halager <halager@gmail.com> parents: 44 diff changeset	169 {
9bc660cbdbec If statements are back Anders Halager <halager@gmail.com> parents: 44 diff changeset	170 sc = push();
9bc660cbdbec If statements are back Anders Halager <halager@gmail.com> parents: 44 diff changeset	171 visitStmt(s.else_body);
9bc660cbdbec If statements are back Anders Halager <halager@gmail.com> parents: 44 diff changeset	172 pop(sc);
9bc660cbdbec If statements are back Anders Halager <halager@gmail.com> parents: 44 diff changeset	173 }
11 642c6a998fd9 Support for while statements and fixed scope for if Anders Halager <halager@gmail.com> parents: 2 diff changeset	174 }
642c6a998fd9 Support for while statements and fixed scope for if Anders Halager <halager@gmail.com> parents: 2 diff changeset	175
642c6a998fd9 Support for while statements and fixed scope for if Anders Halager <halager@gmail.com> parents: 2 diff changeset	176 override void visitWhileStmt(WhileStmt s)
642c6a998fd9 Support for while statements and fixed scope for if Anders Halager <halager@gmail.com> parents: 2 diff changeset	177 {
642c6a998fd9 Support for while statements and fixed scope for if Anders Halager <halager@gmail.com> parents: 2 diff changeset	178 s.env = current();
14 a51bdf15a33d Better scopes. Anders Halager <halager@gmail.com> parents: 11 diff changeset	179 auto sc = push();
11 642c6a998fd9 Support for while statements and fixed scope for if Anders Halager <halager@gmail.com> parents: 2 diff changeset	180 super.visitWhileStmt(s);
14 a51bdf15a33d Better scopes. Anders Halager <halager@gmail.com> parents: 11 diff changeset	181 pop(sc);
11 642c6a998fd9 Support for while statements and fixed scope for if Anders Halager <halager@gmail.com> parents: 2 diff changeset	182 }
642c6a998fd9 Support for while statements and fixed scope for if Anders Halager <halager@gmail.com> parents: 2 diff changeset	183
44 495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 28 diff changeset	184 override void visitCompoundStmt(CompoundStatement s)
495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 28 diff changeset	185 {
495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 28 diff changeset	186 s.env = current();
495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 28 diff changeset	187 auto sc = push();
495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 28 diff changeset	188 super.visitCompoundStmt(s);
495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 28 diff changeset	189 pop(sc);
495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 28 diff changeset	190 }
495188f9078e Big update - Moving towards a better, more seperated parser Anders Halager <halager@gmail.com> parents: 28 diff changeset	191
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	192 private:
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	193 Scope[] table;
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	194
14 a51bdf15a33d Better scopes. Anders Halager <halager@gmail.com> parents: 11 diff changeset	195 Scope push()
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	196 {
14 a51bdf15a33d Better scopes. Anders Halager <halager@gmail.com> parents: 11 diff changeset	197 auto sc = new Scope(current());
a51bdf15a33d Better scopes. Anders Halager <halager@gmail.com> parents: 11 diff changeset	198 table ~= sc;
a51bdf15a33d Better scopes. Anders Halager <halager@gmail.com> parents: 11 diff changeset	199 return sc;
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	200 }
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	201
14 a51bdf15a33d Better scopes. Anders Halager <halager@gmail.com> parents: 11 diff changeset	202 Scope pop(Scope sc = null)
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	203 {
14 a51bdf15a33d Better scopes. Anders Halager <halager@gmail.com> parents: 11 diff changeset	204 if (sc !is null)
a51bdf15a33d Better scopes. Anders Halager <halager@gmail.com> parents: 11 diff changeset	205 {
a51bdf15a33d Better scopes. Anders Halager <halager@gmail.com> parents: 11 diff changeset	206 table.length = table.find(sc);
a51bdf15a33d Better scopes. Anders Halager <halager@gmail.com> parents: 11 diff changeset	207 return sc;
a51bdf15a33d Better scopes. Anders Halager <halager@gmail.com> parents: 11 diff changeset	208 }
a51bdf15a33d Better scopes. Anders Halager <halager@gmail.com> parents: 11 diff changeset	209
1 2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	210 auto res = table[$ - 1];
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	211 table.length = table.length - 1;
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	212 return res;
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	213 }
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	214
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	215 Scope current()
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	216 {
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	217 return table[$ - 1];
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	218 }
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	219 }
2168f4cb73f1 First push johnsen@johnsen-desktop parents: diff changeset	220

Mercurial > projects > dang

annotate sema/ScopeBuilder.d @ 99:857f0d530789 new_gen