From f344b250f6f062a1a1902bf69b23ebf9b565de0e Mon Sep 17 00:00:00 2001 From: "Kartik K. Agaram" Date: Sat, 17 Sep 2016 15:01:51 -0700 Subject: 3395 --- html/018type_abbreviations.cc.html | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'html/018type_abbreviations.cc.html') diff --git a/html/018type_abbreviations.cc.html b/html/018type_abbreviations.cc.html index a025de1d..abb190c1 100644 --- a/html/018type_abbreviations.cc.html +++ b/html/018type_abbreviations.cc.html @@ -177,11 +177,11 @@ def main [ :(scenario abbreviations_for_address_and_array) def main [ - f 1:&:number # abbreviation for 'address:number' - f 2:@:number # abbreviation for 'array:number' - f 3:&:@:number # combining '&' and '@' - f 4:&:&:@:&:@:number # ..any number of times - f {5: (array (& number) 3)} # support for dilated reagents and more complex parse trees + f 1:&:num # abbreviation for 'address:number' + f 2:@:num # abbreviation for 'array:number' + f 3:&:@:num # combining '&' and '@' + f 4:&:&:@:&:@:num # ..any number of times + f {5: (array (& num) 3)} # support for dilated reagents and more complex parse trees ] def f [ ] @@ -199,7 +199,10 @@ Transform.push_back(:(code) void expand_type_abbreviations(const recipe_ordinal r) { - const recipe& caller = get(Recipe, r); + expand_type_abbreviations(get(Recipe, r)); +} + +void expand_type_abbreviations(const recipe& caller) { trace(9991, "transform") << "--- expand type abbreviations in recipe '" << caller.name << "'" << end(); for (int i = 0; i < SIZE(caller.steps); ++i) { const instruction& inst = caller.steps.at(i); -- cgit 1.4.1-2-gfad0