Merge branch 'release/0.18'

crystal-lang · Jun 23, 2016 · ca6154d · ca6154d
2 parents a27799a + 5ece32c
commit ca6154d
Showing 3 changed files with 23 additions and 3 deletions.
diff --git a/spec/compiler/type_inference/visibility_modifiers_spec.cr b/spec/compiler/type_inference/visibility_modifiers_spec.cr
@@ -377,4 +377,11 @@ describe "Visibility modifiers" do
       Foo::Bar(Int32).new.bar
       )) { int32 }
   end
+
+  it "gives correct error on unknown call (#2838)" do
+    assert_error %(
+      private foo
+      ),
+      "undefined local variable or method 'foo'"
+  end
 end
diff --git a/src/compiler/crystal/semantic/main_visitor.cr b/src/compiler/crystal/semantic/main_visitor.cr
@@ -2640,6 +2640,19 @@ module Crystal
       false
     end
 
+    def visit(node : VisibilityModifier)
+      exp = node.exp
+      exp.accept self
+
+      # Only check for calls that didn't resolve to a macro:
+      # all other cases are already covered in TopLevelVisitor
+      if exp.is_a?(Call) && !exp.expanded
+        node.raise "can't apply visibility modifier"
+      end
+
+      false
+    end
+
     # # Helpers
 
     def check_closured(var)

diff --git a/src/compiler/crystal/semantic/top_level_visitor.cr b/src/compiler/crystal/semantic/top_level_visitor.cr
@@ -694,9 +694,9 @@ module Crystal
 
         return false
       when Call
-        if exp.expanded
-          return false
-        end
+        # Don't give an error yet: wait to see if the
+        # call doesn't resolve to a method/macro
+        return false
       end
 
       node.raise "can't apply visibility modifier"