Fixed missing error location. Fixes #2819

crystal-lang · Jun 13, 2016 · 88bd6d0 · 88bd6d0
1 parent ce2f6e2
commit 88bd6d0
Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/src/compiler/crystal/semantic/base_type_visitor.cr b/src/compiler/crystal/semantic/base_type_visitor.cr
@@ -459,6 +459,8 @@ module Crystal
 
     def lookup_type(base_type, names, node, lookup_in_container = true)
       base_type.lookup_type names, lookup_in_container: lookup_in_container
+    rescue ex : Crystal::Exception
+      raise ex
     rescue ex
       node.raise ex.message
     end

diff --git a/src/compiler/crystal/semantic/type_lookup.cr b/src/compiler/crystal/semantic/type_lookup.cr
@@ -97,7 +97,7 @@ module Crystal
         begin
           @type = instance_type.instantiate_named_args(entries)
         rescue ex : Crystal::Exception
-          node.raise ex.message if @raise
+          node.raise "instantiating #{node}", inner: ex if @raise
         end
 
         return false
@@ -161,7 +161,7 @@ module Crystal
       begin
         @type = instance_type.instantiate(type_vars)
       rescue ex : Crystal::Exception
-        node.raise ex.message if @raise
+        node.raise "instantiating #{node}", inner: ex if @raise
       end
 
       false
@@ -228,7 +228,11 @@ module Crystal
 
       meta_vars = MetaVars{"self" => MetaVar.new("self", @self_type)}
       visitor = MainVisitor.new(program, meta_vars)
-      node.expressions.each &.accept visitor
+      begin
+        node.expressions.each &.accept visitor
+      rescue ex : Crystal::Exception
+        node.raise "typing typeof", inner: ex
+      end
       @type = program.type_merge node.expressions
       false
     end
@@ -252,6 +256,8 @@ module Crystal
   class Type
     def lookup_type(node : Path, lookup_in_container = true)
       (node.global ? program : self).lookup_type(node.names, lookup_in_container: lookup_in_container)
+    rescue ex : Crystal::Exception
+      raise ex
     rescue ex
       node.raise ex.message
     end