From d059fe743df6a5e8a72fc1418f2c3ba1ed5ac1e6 Mon Sep 17 00:00:00 2001 From: "Kartik K. Agaram" Date: Thu, 20 Oct 2016 00:37:24 -0700 Subject: 3524 --- html/085scenario_console.cc.html | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'html/085scenario_console.cc.html') diff --git a/html/085scenario_console.cc.html b/html/085scenario_console.cc.html index 23b09fc1..e6c70135 100644 --- a/html/085scenario_console.cc.html +++ b/html/085scenario_console.cc.html @@ -97,7 +97,7 @@ put(Recipe_ordinal,// store length put(Memory, event_data_address+/*skip refcount*/1, num_events); int curr_address = event_data_address + /*skip refcount and length*/2; - for (int i = 0; i < SIZE(r.steps); ++i) { + for (int i = 0; i < SIZE(r.steps); ++i) { const instruction& inst = r.steps.at(i); if (inst.name == "left-click") { trace(9999, "mem") << "storing 'left-click' event starting at " << Current_routine->alloc << end(); @@ -134,7 +134,7 @@ put(Recipe_ordinal,const char* raw_contents = contents.c_str(); int num_keyboard_events = unicode_length(contents); int curr = 0; - for (int i = 0; i < num_keyboard_events; ++i) { + for (int i = 0; i < num_keyboard_events; ++i) { trace(9999, "mem") << "storing 'text' tag at " << curr_address << end(); put(Memory, curr_address, /*tag for 'text' variant of 'event' exclusive-container*/0); uint32_t curr_character; @@ -221,12 +221,9 @@ initialize_key_names(); Key["escape"] = TB_KEY_ESC; } -:(after "Begin transform_names Ingredient Special-cases(ingredient, inst, caller)") +:(after "Begin check_or_set_invalid_types(r)") if (is_scenario(caller)) - initialize_special_name(ingredient); -:(after "Begin transform_names Product Special-cases(product, inst, caller)") -if (is_scenario(caller)) - initialize_special_name(product); + initialize_special_name(r); :(code) bool is_scenario(const recipe& caller) { return starts_with(caller.name, "scenario_"); @@ -307,10 +304,10 @@ put(Recipe_ordinal,int console_address = get_or_insert(Memory, CONSOLE); int console_data = get_or_insert(Memory, console_address+1); int length = get_or_insert(Memory, console_data); // array length - for (int i = 0, curr = console_data+1; i < length; ++i, curr+=size_of_event()) { + for (int i = 0, curr = console_data+1; i < length; ++i, curr+=size_of_event()) { if (get_or_insert(Memory, curr) != /*text*/0) continue; if (get_or_insert(Memory, curr+1) != ingredients.at(0).at(0)) continue; - for (int n = 0; n < size_of_event(); ++n) + for (int n = 0; n < size_of_event(); ++n) put(Memory, curr+n, ingredients.at(1).at(n)); } break; @@ -319,7 +316,7 @@ put(Recipe_ordinal,:(code) int count_events(const recipe& r) { int result = 0; - for (int i = 0; i < SIZE(r.steps); ++i) { + for (int i = 0; i < SIZE(r.steps); ++i) { const instruction& curr = r.steps.at(i); if (curr.name == "type") result += unicode_length(curr.ingredients.at(0).name); -- cgit 1.4.1-2-gfad0