From 255c2293e52d5c273b77aec1a0470a24304a1c2c Mon Sep 17 00:00:00 2001 From: "Kartik K. Agaram" Date: Mon, 5 Oct 2015 20:24:23 -0700 Subject: 2251 Unbelievable that this hitherto-unanticipated test passed so easily. Even though I'm simply bolting on special cases in an ad hoc manner, this isn't too shabby. --- 030container.cc | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/030container.cc b/030container.cc index 0e39e757..0cecdec7 100644 --- a/030container.cc +++ b/030container.cc @@ -618,7 +618,7 @@ recipe main [ :(before "End Globals") // We'll use large type ordinals to mean "the following type of the variable". -const int FINAL_TYPE_ORDINAL = 900; +const int FINAL_TYPE_ORDINAL = 2000; :(before "End Test Run Initialization") assert(Next_type_ordinal < FINAL_TYPE_ORDINAL); @@ -705,3 +705,19 @@ if (Type[base_type].elements.at(i).at(0) >= FINAL_TYPE_ORDINAL) { result += size_of_ingredient(Type[base_type], i, base.types); continue; } + +:(scenario get_on_generic_container_inside_generic_container) +container foo [ + t <- next-type + x:t + y:number +] +container bar [ + x:foo:point + y:number +] +recipe main [ + 1:bar <- merge 14, 15, 16, 17 + 2:number <- get 1:bar, 1:offset +] ++mem: storing 17 in location 2 -- cgit 1.4.1-2-gfad0