Resolve symbols during transformation

diff --git a/codegen/valagvarianttransformer.vala b/codegen/valagvarianttransformer.vala
index a48189d6b32624c46e625b68e3e9fa33ed9c458d..7d9b8a6ab5b04c4f1ff305c62226acfe86772e20 100644 (file)
--- a/codegen/valagvarianttransformer.vala
+++ b/codegen/valagvarianttransformer.vala
@@ -270,6 +270,9 @@ public class Vala.GVariantTransformer : CodeTransformer {
                                b.add_expression (call);
                        }
                        b.add_return (expression (@"$builder.end ()"));
+
+                       b.pop_method ();
+                       check (m);
                }
 
                var call = (MethodCall) expression (m.name+"()");
@@ -286,7 +289,7 @@ public class Vala.GVariantTransformer : CodeTransformer {
                        var builderinit = expression (@"new GLib.VariantBuilder (new GLib.VariantType (\"$(get_type_signature (type))\"))");
                        var builder = b.add_temp_declaration (null, builderinit);
 
-                       var for_each = expression (@"ht.for_each ((k,v) => $builder.add (\"{?*}\", k, v))");
+                       var for_each = expression (@"ht.for_each ((k,v) => { GLib.Variant k1 = k; GLib.Variant v1 = v; $builder.add (\"{?*}\", k, v); })");
                        b.add_expression (for_each);
                        b.add_return (expression (@"$builder.end ()"));
 

diff --git a/vala/valacodetransformer.vala b/vala/valacodetransformer.vala
index ec2d6b6c247369e9bb4d49671e7c834aaa057a01..12dfe74790eb9a62bc545f3e0af30326334c66b6 100644 (file)
--- a/vala/valacodetransformer.vala
+++ b/vala/valacodetransformer.vala
@@ -45,6 +45,7 @@ public class Vala.CodeTransformer : CodeVisitor {
        }
 
        public void check (CodeNode node) {
+               node.accept (context.resolver);
                if (!node.check (context)) {
                        return;
                }