diff options
author | Kartik K. Agaram <vc@akkartik.com> | 2016-02-06 09:34:22 -0800 |
---|---|---|
committer | Kartik K. Agaram <vc@akkartik.com> | 2016-02-06 09:34:22 -0800 |
commit | 57bf0075bf2480b9662fea64d858f2995e9c4ef2 (patch) | |
tree | 1510fcc1fcaa5073178923a9102aefcba1092aa8 | |
parent | 3e5f435842f4dbd23842c3a948840ac848cfbf26 (diff) | |
download | mu-57bf0075bf2480b9662fea64d858f2995e9c4ef2.tar.gz |
2632
-rw-r--r-- | 030container.cc | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/030container.cc b/030container.cc index 373b3590..2164f376 100644 --- a/030container.cc +++ b/030container.cc @@ -628,6 +628,19 @@ void check_invalid_types(type_tree* type, const string& block, const string& nam //:: Construct types out of their constituent fields. Doesn't currently do //:: type-checking but *does* match sizes. + +:(scenario merge) +container foo [ + x:number + y:number +] + +recipe main [ + 1:foo <- merge 3, 4 +] ++mem: storing 3 in location 1 ++mem: storing 4 in location 2 + :(before "End Primitive Recipe Declarations") MERGE, :(before "End Primitive Recipe Numbers") @@ -644,15 +657,3 @@ case MERGE: { products.at(0).push_back(ingredients.at(i).at(j)); break; } - -:(scenario merge) -container foo [ - x:number - y:number -] - -recipe main [ - 1:foo <- merge 3, 4 -] -+mem: storing 3 in location 1 -+mem: storing 4 in location 2 |