crystal-lang · Feb 19, 2017 · Feb 19, 2017
Showing with 30 additions and 6 deletions.

+24 −0 spec/compiler/semantic/instance_var_spec.cr

+1 −1 src/compiler/crystal/semantic/main_visitor.cr

+5 −5 src/string.cr
diff --git a/spec/compiler/semantic/instance_var_spec.cr b/spec/compiler/semantic/instance_var_spec.cr
@@ -4601,4 +4601,28 @@ describe "Semantic: instance var" do
       Qux.new
       )) { types["Qux"] }
   end
+
+  it "errors if unknown ivar through macro (#4050)" do
+    assert_error %(
+      class Foo
+        def initialize(**attributes)
+          {% for var in @type.instance_vars %}
+            if arg = attributes[:{{var.name.id}}]?
+              @{{var.name.id}} = arg
+            end
+          {% end %}
+        end
+      end
+
+      class Bar < Foo
+        def initialize(**attributes)
+          @bar = true
+          super
+        end
+      end
+
+      Bar.new
+      ),
+      "Can't infer the type of instance variable '@bar' of Foo"
+  end
 end
diff --git a/src/compiler/crystal/semantic/main_visitor.cr b/src/compiler/crystal/semantic/main_visitor.cr
@@ -3009,7 +3009,7 @@ module Crystal
       @vars.each do |name, var|
         if name.starts_with? '@'
           if var.nil_if_read?
-            ivar = owner.lookup_instance_var(name)
+            ivar = lookup_instance_var(var, owner)
             ivar.bind_to program.nil_var
           end
 

diff --git a/src/string.cr b/src/string.cr
@@ -98,15 +98,15 @@ require "c/string"
 # byte sequence according to UTF-8. This can happen if the string is created
 # via one of the constructors that accept bytes, or when getting a string
 # from `String.build` or `IO::Memory`. No exception will be raised, but
-# invalid byte sequences, when asked as chars, will use the unicode replamcenet
+# invalid byte sequences, when asked as chars, will use the unicode replacement
 # char (value 0xFFFD). For example:
 #
 # ```
 # # here 255 is not a valid byte value in the UTF-8 encoding
 # string = String.new(Bytes[255, 97])
 # string.valid_encoding? # => false
 #
-# # The first char here is the unicode replacemnt char
+# # The first char here is the unicode replacement char
 # string.chars # => ['�', 'a']
 # ```
 #
@@ -1209,9 +1209,9 @@ class String
   # Returns `nil` if this string does not denote an hexstring.
   #
   # ```
-  # "0102031aff".hexbytes? # => Bytes[1, 2, 3, 26, 255]
-  # "1".hexbytes?          # => nil
-  # "hello world".hexbytes # => nil
+  # "0102031aff".hexbytes?  # => Bytes[1, 2, 3, 26, 255]
+  # "1".hexbytes?           # => nil
+  # "hello world".hexbytes? # => nil
   # ```
   def hexbytes? : Bytes?
     return unless bytesize.divisible_by?(2)