Fixed #3050: preserves order of instance vars

crystal-lang · Jul 26, 2016 · 82fcf2b · 82fcf2b
1 parent e592bc8
commit 82fcf2b
Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/spec/compiler/semantic/class_spec.cr b/spec/compiler/semantic/class_spec.cr
@@ -1027,4 +1027,18 @@ describe "Semantic: class" do
       ),
       "there's no self in this scope"
   end
+
+  it "preserves order of instance vars (#3050)" do
+    result = semantic("
+      class Foo
+        @x = uninitialized Int32
+        @y : Int32
+
+        def initialize(@y)
+        end
+      end
+      ")
+    instance_vars = result.program.types["Foo"].instance_vars.to_a.map(&.[0])
+    instance_vars.should eq(%w(@x @y))
+  end
 end
diff --git a/src/compiler/crystal/semantic/type_declaration_visitor.cr b/src/compiler/crystal/semantic/type_declaration_visitor.cr
@@ -355,6 +355,8 @@ module Crystal
     def visit(node : UninitializedVar)
       var = node.var
       case var
+      when InstanceVar
+        declare_instance_var(node, var)
       when ClassVar
         declare_class_var(node, var, true)
       when Global