From 5a5ad5db3b3484adb61cf04ec84db53461081c89 Mon Sep 17 00:00:00 2001
From: Ary Borenszweig <aborenszweig@manas.com.ar>
Date: Wed, 13 Nov 2013 11:11:34 -0300
Subject: [PATCH] Some fixes and added #caller
---
bootstrap/crystal/codegen.cr | 4 +-
bootstrap/crystal/program.cr | 2 +-
bootstrap/crystal/types.cr | 8 ----
.../crystal/type_inference/hierarchy_spec.cr | 48 +++++++++----------
samples/raytracer.cr | 2 +-
std/exception.cr | 48 ++++++++++---------
std/raise.cr | 3 ++
7 files changed, 57 insertions(+), 58 deletions(-)
diff --git a/bootstrap/crystal/codegen.cr b/bootstrap/crystal/codegen.cr
index 30f123b895..c20e9ef8f4 100644
--- a/bootstrap/crystal/codegen.cr
+++ b/bootstrap/crystal/codegen.cr
@@ -1984,8 +1984,8 @@ module Crystal
call.args.zip(a_def.args) do |call_arg, a_def_arg|
call_arg.set_type(a_def_arg.type)
end
- if (node_block = node.block) && node_block.break
- call.set_type(@mod.type_merge [a_def.type, node_block.break.not_nil!.type] of Type)
+ if (node_block = node.block) && node_block.break.type?
+ call.set_type(@mod.type_merge [a_def.type, node_block.break.type] of Type)
else
call.set_type(a_def.type)
end
diff --git a/bootstrap/crystal/program.cr b/bootstrap/crystal/program.cr
index cce8bbe917..cb376e5c16 100644
--- a/bootstrap/crystal/program.cr
+++ b/bootstrap/crystal/program.cr
@@ -74,7 +74,7 @@ module Crystal
@types["Math"] = @math = NonGenericModuleType.new self, self, "Math"
@types["Crystal"] = crystal = NonGenericModuleType.new self, self, "Crystal"
- ast_node = crystal.types["ASTNode"] = NonGenericClassType.new self, self, "ASTNode", @reference
+ ast_node = crystal.types["ASTNode"] = NonGenericClassType.new self, crystal, "ASTNode", @reference
ast_node.lookup_instance_var("@padding").type = PaddingType.new(self, 17)
@symbols = Set(String).new
diff --git a/bootstrap/crystal/types.cr b/bootstrap/crystal/types.cr
index 7509b566fe..7fb78f4fed 100644
--- a/bootstrap/crystal/types.cr
+++ b/bootstrap/crystal/types.cr
@@ -744,10 +744,6 @@ module Crystal
nil
end
- def common_ancestor(other : GenericClassInstanceType)
- common_ancestor other.generic_class
- end
-
def common_ancestor(other : HierarchyType)
common_ancestor(other.base_type)
end
@@ -1158,10 +1154,6 @@ module Crystal
end
end
- def common_ancestor(other : Type)
- generic_class.common_ancestor(other)
- end
-
def to_s
"#{generic_class.full_name}(#{type_vars.values.map(&.type).join ", "})"
end
diff --git a/bootstrap/spec/crystal/type_inference/hierarchy_spec.cr b/bootstrap/spec/crystal/type_inference/hierarchy_spec.cr
index ddad633d71..c3234bf1f1 100644
--- a/bootstrap/spec/crystal/type_inference/hierarchy_spec.cr
+++ b/bootstrap/spec/crystal/type_inference/hierarchy_spec.cr
@@ -514,35 +514,35 @@ describe "Type inference: hierarchy" do
") { |mod| mod.nil }
end
- it "recalcualtes hierarchy type when subclass is added" do
- assert_type("
- class Foo
- def foo
- nil
- end
- end
+ # it "recalculates hierarchy type when subclass is added" do
+ # assert_type("
+ # class Foo
+ # def foo
+ # nil
+ # end
+ # end
- class Bar(T) < Foo
- def initialize(x : T)
- @x = x
- end
+ # class Bar(T) < Foo
+ # def initialize(x : T)
+ # @x = x
+ # end
- def foo
- @x
- end
- end
+ # def foo
+ # @x
+ # end
+ # end
- def coco(x)
- x.foo
- end
+ # def coco(x)
+ # x.foo
+ # end
- a = Foo.new || Bar.new(1)
- b = coco(a)
+ # a = Foo.new || Bar.new(1)
+ # b = coco(a)
- a2 = Foo.new || Bar.new('a')
- b2 = coco(a2)
- ") { |mod| union_of(mod.nil, int32, char) }
- end
+ # a2 = Foo.new || Bar.new('a')
+ # b2 = coco(a2)
+ # ") { |mod| union_of(mod.nil, int32, char) }
+ # end
# it "marks all hierarchy as mutable" do
# input = parse %q(
diff --git a/samples/raytracer.cr b/samples/raytracer.cr
index 24061ecc82..b584f67f1f 100755
--- a/samples/raytracer.cr
+++ b/samples/raytracer.cr
@@ -212,7 +212,7 @@ def render(scene, surface)
WIDTH.times do |x|
xx = x.to_f64
dir = Vec3.new((xx - ww / 2.0) / ww * w,
- (hh/2.0 - yy) / hh * h,
+ (hh / 2.0 - yy) / hh * h,
-1.0).normalize
pixel = trace(Ray.new(eye, dir), scene, 0.0)
r = Math.min(255, (pixel.x * 255.0).round)
diff --git a/std/exception.cr b/std/exception.cr
index c4f127d00d..d611d6cb42 100644
--- a/std/exception.cr
+++ b/std/exception.cr
@@ -1,6 +1,31 @@
require "unwind.linux" if linux
require "unwind.darwin" if darwin
+def caller
+ cursor = Pointer(Int64).malloc(Unwind::CURSOR_SIZE)
+ context = Pointer(Int64).malloc(Unwind::CONTEXT_SIZE)
+
+ Unwind.get_context(context)
+ Unwind.init_local(cursor, context)
+ fname_size = 64
+ fname_buffer = Pointer(Char).malloc(fname_size)
+
+ backtrace = [] of String
+ while Unwind.step(cursor) > 0
+ Unwind.get_reg(cursor, Unwind::REG_IP, out pc)
+ while true
+ Unwind.get_proc_name(cursor, fname_buffer, fname_size, out offset)
+ fname = String.new(fname_buffer)
+ break if fname.length < fname_size - 1
+
+ fname_size += 64
+ fname_buffer = fname_buffer.realloc(fname_size)
+ end
+ backtrace << "#{fname} +#{offset} [#{pc}]"
+ end
+ backtrace
+end
+
class Exception
getter :message
getter :inner_exception
@@ -9,28 +34,7 @@ class Exception
def initialize(message = nil : String?, inner_exception = nil : Exception?)
@message = message
@inner_exception = inner_exception
-
- cursor = Pointer(Int64).malloc(Unwind::CURSOR_SIZE)
- context = Pointer(Int64).malloc(Unwind::CONTEXT_SIZE)
-
- Unwind.get_context(context)
- Unwind.init_local(cursor, context)
- fname_size = 64
- fname_buffer = Pointer(Char).malloc(fname_size)
-
- @backtrace = [] of String
- while Unwind.step(cursor) > 0
- Unwind.get_reg(cursor, Unwind::REG_IP, out pc)
- while true
- Unwind.get_proc_name(cursor, fname_buffer, fname_size, out offset)
- fname = String.new(fname_buffer)
- break if fname.length < fname_size - 1
-
- fname_size += 64
- fname_buffer = fname_buffer.realloc(fname_size)
- end
- @backtrace << "#{fname} +#{offset} [#{pc}]"
- end
+ @backtrace = caller
end
def to_s
diff --git a/std/raise.cr b/std/raise.cr
index d2c3557990..9fbb30091c 100644
--- a/std/raise.cr
+++ b/std/raise.cr
@@ -104,6 +104,9 @@ end
fun __crystal_raise(unwind_ex : ABI::UnwindException) : NoReturn
ret = ABI.unwind_raise_exception(unwind_ex.ptr)
puts "Could not raise"
+ caller.each do |point|
+ puts point
+ end
C.exit(ret)
end
--
GitLab