Compiler: fixed missing analysis of macros for instance and class var…

…s initializers. Fixes #3191
crystal-lang · Sep 1, 2016 · 90e9cfb · 90e9cfb
1 parent 76983c2
commit 90e9cfb
Showing 3 changed files with 32 additions and 2 deletions.
diff --git a/spec/compiler/codegen/macro_spec.cr b/spec/compiler/codegen/macro_spec.cr
@@ -1438,4 +1438,32 @@ describe "Code gen: macro" do
       a
       )).to_i.should eq(2)
   end
+
+  it "initializes instance var in macro" do
+    run(%(
+      class Foo
+        {% begin %}
+          @x = 1
+        {% end %}
+      end
+
+      Foo.new.@x
+      ), inject_primitives: false).to_i.should eq(1)
+  end
+
+  it "initializes class var in macro" do
+    run(%(
+      class Foo
+        {% begin %}
+          @@x = 1
+        {% end %}
+
+        def self.x
+          @@x
+        end
+      end
+
+      Foo.x
+      ), inject_primitives: false).to_i.should eq(1)
+  end
 end
diff --git a/src/compiler/crystal/semantic/class_vars_initializer_visitor.cr b/src/compiler/crystal/semantic/class_vars_initializer_visitor.cr
@@ -119,7 +119,8 @@ module Crystal
         node.target.is_a?(ClassVar)
       when TypeDeclaration
         node.var.is_a?(ClassVar)
-      when FileNode, Expressions, ClassDef, ModuleDef, EnumDef, Alias, Include, Extend, LibDef, Def, Macro, Call, Require
+      when FileNode, Expressions, ClassDef, ModuleDef, EnumDef, Alias, Include, Extend, LibDef, Def, Macro, Call, Require,
+           MacroExpression, MacroIf, MacroFor
         true
       else
         false

diff --git a/src/compiler/crystal/semantic/instance_vars_initializer_visitor.cr b/src/compiler/crystal/semantic/instance_vars_initializer_visitor.cr
@@ -32,7 +32,8 @@ class Crystal::InstanceVarsInitializerVisitor < Crystal::SemanticVisitor
       node.target.is_a?(InstanceVar)
     when TypeDeclaration
       node.var.is_a?(InstanceVar)
-    when FileNode, Expressions, ClassDef, ModuleDef, Alias, Include, Extend, LibDef, Def, Macro, Call, Require
+    when FileNode, Expressions, ClassDef, ModuleDef, Alias, Include, Extend, LibDef, Def, Macro, Call, Require,
+         MacroExpression, MacroIf, MacroFor
       true
     else
       false