make assignment type check errors more informative

rakudo · Feb 19, 2011 · 14319fc · 14319fc
1 parent 2fc617f
commit 14319fc
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/docs/ChangeLog b/docs/ChangeLog
@@ -1,3 +1,6 @@
+New in 2011.03 release
++ improved error message on type check failure in assignment
+
 New in 2011.02 release
 + IPv6 support
 + more robust numeric exponentation

diff --git a/src/builtins/assign.pir b/src/builtins/assign.pir
@@ -13,6 +13,8 @@ src/builtins/assign.pir - assignment operations
     .param pmc cont
     .param pmc source
 
+    .annotate 'invizible_frame', 1
+
   cont_loop:
     # If the lhs isn't marked rw, throw exception
     .local pmc rw
@@ -40,7 +42,15 @@ src/builtins/assign.pir - assignment operations
     if null type goto type_ok
     $P0 = type.'ACCEPTS'(source)
     if $P0 goto type_ok
-    '&die'('Type check failed for assignment')
+    .local string error_msg
+    error_msg = "Type check failed for assignment\n    Container type: "
+    $S0 = type.'perl'()
+    error_msg = concat error_msg, $S0
+    error_msg = concat error_msg, "\n               Got: "
+    $P0 = source.'WHAT'()
+    $S0 = $P0.'perl'()
+    error_msg = concat error_msg, $S0
+    '&die'(error_msg)
   type_ok:
 
     # Dereference the scalar LHS.  If the thing we're
@@ -82,6 +92,8 @@ src/builtins/assign.pir - assignment operations
 
   cont_store:
     .tailcall cont.'!STORE'(source)
+
+    .annotate 'invizible_frame', 1
 .end