From 7eec783e6ef16722cfa7e5631bff724742cdefb0 Mon Sep 17 00:00:00 2001
From: "Kartik K. Agaram" <vc@akkartik.com>
Date: Thu, 28 Jan 2016 15:16:22 -0800
Subject: 2613 - better error message when forgetting 'shared'

---
 038new.cc | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/038new.cc b/038new.cc
index 1156bb12..95339edc 100644
--- a/038new.cc
+++ b/038new.cc
@@ -94,21 +94,28 @@ case NEW: {
     raise_error << maybe(caller.name) << "result of 'new' should never be ignored\n" << end();
     break;
   }
-  reagent product(inst.products.at(0));
+  if (!product_of_new_is_valid(inst)) {
+    raise_error << maybe(caller.name) << "product of 'new' has incorrect type: " << inst.to_string() << '\n' << end();
+    break;
+  }
+  break;
+}
+:(code)
+bool product_of_new_is_valid(const instruction& inst) {
+  reagent product = inst.products.at(0);
   canonize_type(product);
+  if (!product.type || product.type->value != get(Type_ordinal, "address")) return false;
   drop_from_type(product, "address");
+  if (!product.type || product.type->value != get(Type_ordinal, "shared")) return false;
   drop_from_type(product, "shared");
   if (SIZE(inst.ingredients) > 1) {
     // array allocation
+    if (!product.type || product.type->value != get(Type_ordinal, "array")) return false;
     drop_from_type(product, "array");
   }
-  reagent expected_product("x:"+type.name);
+  reagent expected_product("x:"+inst.ingredients.at(0).name);
   // End Post-processing(expected_product) When Checking 'new'
-  if (!types_strictly_match(product, expected_product)) {
-    raise_error << maybe(caller.name) << "product of 'new' has incorrect type: " << inst.to_string() << '\n' << end();
-    break;
-  }
-  break;
+  return types_strictly_match(product, expected_product);
 }
 
 //:: translate 'new' to 'allocate' instructions that take a size instead of a type
@@ -229,6 +236,13 @@ recipe main [
 ]
 +mem: storing 0 in location 2
 
+:(scenario new_error)
+% Hide_errors = true;
+recipe main [
+  1:address:number/raw <- new number:type
+]
++error: main: product of 'new' has incorrect type: 1:address:number/raw <- new number:type
+
 :(scenario new_array)
 recipe main [
   1:address:shared:array:number/raw <- new number:type, 5
-- 
cgit 1.4.1-2-gfad0