From dbe124108b7a3529feeeba91339928c4ac737072 Mon Sep 17 00:00:00 2001 From: "Kartik K. Agaram" Date: Tue, 23 Jun 2015 14:02:12 -0700 Subject: 1631 - update html versions Html is a little more readable thanks to feedback from J David Eisenberg (https://news.ycombinator.com/item?id=9766330), in particular the suggestion to use https://addons.mozilla.org/En-us/firefox/addon/wcag-contrast-checker. --- html/000organization.cc.html | 8 +- html/001help.cc.html | 8 +- html/002test.cc.html | 10 +- html/003trace.cc.html | 13 +- html/003trace.test.cc.html | 8 +- html/010vm.cc.html | 13 +- html/011load.cc.html | 19 +- html/012transform.cc.html | 10 +- html/013literal_string.cc.html | 146 ++++++++- html/014literal_noninteger.cc.html | 8 +- html/014types.cc.html | 10 +- html/020run.cc.html | 45 ++- html/021arithmetic.cc.html | 8 +- html/022boolean.cc.html | 8 +- html/023jump.cc.html | 10 +- html/024compare.cc.html | 8 +- html/025trace.cc.html | 12 +- html/026assert.cc.html | 8 +- html/027debug.cc.html | 12 +- html/030container.cc.html | 49 ++- html/031address.cc.html | 12 +- html/032array.cc.html | 16 +- html/033length.cc.html | 8 +- html/034exclusive_container.cc.html | 29 +- html/035call.cc.html | 10 +- html/036call_ingredient.cc.html | 10 +- html/037call_reply.cc.html | 36 +- html/038scheduler.cc.html | 13 +- html/039wait.cc.html | 10 +- html/040brace.cc.html | 22 +- html/041name.cc.html | 25 +- html/042new.cc.html | 38 ++- html/043space.cc.html | 10 +- html/044space_surround.cc.html | 10 +- html/045closure_name.cc.html | 24 +- html/046tangle.cc.html | 10 +- html/047jump_label.cc.html | 12 +- html/048call_variable.cc.html | 10 +- html/049continuation.cc.html | 10 +- html/050scenario.cc.html | 54 +-- html/051scenario_test.mu.html | 6 +- html/060string.mu.html | 580 ++++++++++++++++++++++++++++++++- html/061channel.mu.html | 50 +-- html/062array.mu.html | 16 +- html/063list.mu.html | 10 +- html/064random.cc.html | 8 +- html/065duplex_list.mu.html | 407 +++++++++++++++++++++++ html/066stream.mu.html | 79 +++++ html/070display.cc.html | 109 ++++--- html/071print.mu.html | 143 +++++++- html/072scenario_screen.cc.html | 25 +- html/073scenario_screen_test.mu.html | 6 +- html/074keyboard.mu.html | 114 ++++--- html/075scenario_console.cc.html | 258 +++++++++++++++ html/075scenario_keyboard.cc.html | 10 +- html/076scenario_console_test.mu.html | 59 ++++ html/076scenario_keyboard_test.mu.html | 6 +- html/077mouse.cc.html | 10 +- html/077trace_browser.cc.html | 10 +- html/078run_interactive.cc.html | 10 +- html/080trace_browser.cc.html | 10 +- html/081run_interactive.cc.html | 10 +- html/999spaces.cc.html | 8 +- html/callcc.mu.html | 8 +- html/channel.mu.html | 12 +- html/chessboard.mu.html | 69 ++-- html/console.mu.html | 50 +++ html/counters.mu.html | 16 +- html/display.mu.html | 28 +- html/edit.mu.html | 527 ++++++++++++++++++++++++------ html/factorial.mu.html | 10 +- html/fork.mu.html | 10 +- html/keyboard.mu.html | 10 +- html/mouse.mu.html | 8 +- html/repl.mu.html | 317 ++++++++++-------- html/screen.mu.html | 24 +- html/tangle.mu.html | 10 +- html/x.mu.html | 6 +- 78 files changed, 3005 insertions(+), 826 deletions(-) create mode 100644 html/065duplex_list.mu.html create mode 100644 html/066stream.mu.html create mode 100644 html/075scenario_console.cc.html create mode 100644 html/076scenario_console_test.mu.html create mode 100644 html/console.mu.html (limited to 'html') diff --git a/html/000organization.cc.html b/html/000organization.cc.html index c64fef78..641dae8c 100644 --- a/html/000organization.cc.html +++ b/html/000organization.cc.html @@ -12,12 +12,12 @@ diff --git a/html/001help.cc.html b/html/001help.cc.html index bed37ea9..052fd061 100644 --- a/html/001help.cc.html +++ b/html/001help.cc.html @@ -12,11 +12,11 @@ diff --git a/html/003trace.cc.html b/html/003trace.cc.html index 12d04729..b0fd9266 100644 --- a/html/003trace.cc.html +++ b/html/003trace.cc.html @@ -12,13 +12,13 @@ @@ -203,6 +203,7 @@ struct die {}; :(before "End Tracing") ostream& operator<<(ostream& os, unused die) { if (Hide_warnings) return os; + tb_shutdown(); os << "dying"; if (Trace_stream) Trace_stream->newline(); exit(1); @@ -382,6 +383,8 @@ using std::ostringstream; using std::ifstream; using std::ofstream; +#include"termbox/termbox.h" + #define unused __attribute__((unused)) :(before "End Globals") diff --git a/html/003trace.test.cc.html b/html/003trace.test.cc.html index 2bb648f5..91391d7b 100644 --- a/html/003trace.test.cc.html +++ b/html/003trace.test.cc.html @@ -12,11 +12,11 @@ diff --git a/html/010vm.cc.html b/html/010vm.cc.html index 97703c55..5f40619e 100644 --- a/html/010vm.cc.html +++ b/html/010vm.cc.html @@ -12,14 +12,14 @@ @@ -230,12 +230,14 @@ reagent::reagent(string s properties.at(0).second.push_back("dummy"); } } + reagent::reagent() :value(0), initialized(false) { // The first property is special, so ensure we always have it. // Other properties can be pushed back, but the first must always be // assigned to. properties.push_back(pair<string, vector<string> >("", vector<string>())); } + string reagent::to_string() const { ostringstream out; out << "{name: \"" << name << "\""; @@ -252,6 +254,7 @@ string reagent::to_string() const } } out << "}"; +//? if (properties.at(0).second.empty()) cerr << out.str(); //? 1 return out.str(); } diff --git a/html/011load.cc.html b/html/011load.cc.html index 547e81ce..fe74ef6e 100644 --- a/html/011load.cc.html +++ b/html/011load.cc.html @@ -12,15 +12,15 @@ @@ -51,14 +51,17 @@ vector<recipe_number> load(string form} vector<recipe_number> load(istream& in) { + in >> std::noskipws; vector<recipe_number> result; while (!in.eof()) { +//? cerr << "===\n"; //? 1 skip_whitespace_and_comments(in); if (in.eof()) break; string command = next_word(in); // Command Handlers if (command == "recipe") { string recipe_name = next_word(in); +//? cerr << "recipe: " << recipe_name << '\n'; //? 1 if (recipe_name.empty()) raise << "empty recipe name\n"; if (Recipe_number.find(recipe_name) == Recipe_number.end()) { @@ -94,12 +97,14 @@ recipe slurp_recipe(istream& in; while (next_instruction(in, &curr)) { // End Rewrite Instruction(curr) +//? cerr << "instruction: " << curr.to_string() << '\n'; //? 2 result.steps.push_back(curr); } return result; } bool next_instruction(istream& in, instruction* curr) { + in >> std::noskipws; curr->clear(); if (in.eof()) return false; //? show_rest_of_stream(in); //? 1 @@ -113,6 +118,7 @@ bool next_instruction(istream& in(in); if (in.eof()) return false; //? show_rest_of_stream(in); //? 1 string word = next_word(in); if (in.eof()) return false; +//? cerr << "AAA: " << word << '\n'; //? 1 words.push_back(word); skip_whitespace(in); if (in.eof()) return false; } @@ -136,6 +142,7 @@ bool next_instruction(istream& in(; *p != "<-"; ++p) { if (*p == ",") continue; curr->products.push_back(reagent(*p)); +//? cerr << "product: " << curr->products.back().to_string() << '\n'; //? 1 } ++p; // skip <- } @@ -153,6 +160,7 @@ bool next_instruction(istream& in(; p != words.end(); ++p) { if (*p == ",") continue; curr->ingredients.push_back(reagent(*p)); +//? cerr << "ingredient: " << curr->ingredients.back().to_string() << '\n'; //? 1 } trace("parse") << "instruction: " << curr->name; @@ -172,6 +180,7 @@ string next_word(istream& in(in, out); skip_whitespace(in); skip_comment(in); +//? cerr << '^' << out.str() << "$\n"; //? 1 return out.str(); } diff --git a/html/012transform.cc.html b/html/012transform.cc.html index 425e4efe..a03c39c2 100644 --- a/html/012transform.cc.html +++ b/html/012transform.cc.html @@ -12,11 +12,11 @@ diff --git a/html/013literal_string.cc.html b/html/013literal_string.cc.html index c81057d7..fae6a0f2 100644 --- a/html/013literal_string.cc.html +++ b/html/013literal_string.cc.html @@ -12,15 +12,15 @@ @@ -44,13 +44,13 @@ body { font-family: monospace; color: #eeeeee; background-color: #080808; } recipe main [ 1:address:array:character <- copy [abc def] # copy can't really take a string ] -+parse: ingredient: {name: "abc def", properties: ["abc def": "literal-string"]} ++parse: ingredient: {name: "abc def", properties: [_: "literal-string"]} :(scenario string_literal_with_colons) recipe main [ 1:address:array:character <- copy [abc:def/ghi] ] -+parse: ingredient: {name: "abc:def/ghi", properties: ["abc:def/ghi": "literal-string"]} ++parse: ingredient: {name: "abc:def/ghi", properties: [_: "literal-string"]} :(before "End Mu Types Initialization") Type_number["literal-string"] = 0; @@ -60,20 +60,51 @@ Type_number["literal-string"] = (in); skip_whitespace(in); skip_comment(in); +//? cerr << '^' << result << "$\n"; //? 1 return result; } :(code) string slurp_quoted(istream& in) { - assert(!in.eof()); - assert(in.peek() == '['); ostringstream out; - int brace_depth = 0; + assert(!in.eof()); assert(in.peek() == '['); out << static_cast<char>(in.get()); // slurp the '[' + if (code_string(in, out)) + slurp_quoted_comment_aware(in, out); + else + slurp_quoted_comment_oblivious(in, out); + return out.str(); +} + +// A string is a code string if it contains a newline before any non-whitespace +// todo: support comments before the newline. But that gets messy. +bool code_string(istream& in, ostringstream& out) { + while (!in.eof()) { + char c = in.get(); + if (!isspace(c)) { + in.putback(c); +//? cerr << "code_string: " << out.str() << '\n'; //? 1 + return false; + } + out << c; + if (c == '\n') { +//? cerr << "code_string: " << out.str() << '\n'; //? 1 + return true; + } + } + return false; +} + +// Read a regular string. Regular strings can only contain other regular +// strings. +void slurp_quoted_comment_oblivious(istream& in, ostringstream& out) { +//? cerr << "comment oblivious\n"; //? 1 + int brace_depth = 1; while (!in.eof()) { char c = in.get(); +//? cerr << '%' << (int)c << ' ' << brace_depth << ": " << out.str() << "%$\n"; //? 1 //? cout << (int)c << ": " << brace_depth << '\n'; //? 2 if (c == '\\') { - out << (char)in.get(); + out << static_cast<char>(in.get()); continue; } out << c; @@ -84,9 +115,36 @@ string slurp_quoted(istream& in} if (in.eof() && brace_depth > 0) { raise << "unbalanced '['\n"; - return ""; + out.clear(); } - return out.str(); +} + +// Read a code string. Code strings can contain either code or regular strings. +void slurp_quoted_comment_aware(istream& in, ostringstream& out) { +//? cerr << "comment aware\n"; //? 1 + char c; + while (in >> c) { +//? cerr << '^' << (int)c << ": " << out.str() << "$\n"; //? 1 + if (c == '\\') { + out << static_cast<char>(in.get()); + continue; + } + if (c == '#') { + out << c; + while (!in.eof() && in.peek() != '\n') out << static_cast<char>(in.get()); + continue; + } + if (c == '[') { + in.putback(c); + // recurse + out << slurp_quoted(in); + continue; + } + out << c; + if (c == ']') return; + } + raise << "unbalanced '['\n"; + out.clear(); } :(after "reagent::reagent(string s)") @@ -95,7 +153,7 @@ string slurp_quoted(istream& in(*s.rbegin() == ']'); // delete [] delimiters s.erase(0, 1); - s.erase(SIZE(s)-1, SIZE(s)); + s.erase(SIZE(s)-1); name = s; types.push_back(0); properties.push_back(pair<string, vector<string> >(name, vector<string>())); @@ -103,27 +161,81 @@ string slurp_quoted(istream& inreturn; } +//: Two tweaks to printing literal strings compared to other reagents: +//: a) Don't print the string twice in the representation, just put '_' in +//: the property list. +//: b) Escape newlines in the string to make it more friendly to trace(). + +:(after "string reagent::to_string()") + if (!properties.at(0).second.empty() && properties.at(0).second.at(0) == "literal-string") { + return emit_literal_string(name); + } + +:(code) +string emit_literal_string(string name) { + size_t pos = 0; + while (pos != string::npos) + pos = replace(name, "\n", "\\n", pos); + return "{name: \""+name+"\", properties: [_: \"literal-string\"]}"; +} + +size_t replace(string& str, const string& from, const string& to, size_t n) { + size_t result = str.find(from, n); + if (result != string::npos) + str.replace(result, from.length(), to); + return result; +} + :(scenario string_literal_nested) recipe main [ 1:address:array:character <- copy [abc [def]] ] -+parse: ingredient: {name: "abc [def]", properties: ["abc [def]": "literal-string"]} ++parse: ingredient: {name: "abc [def]", properties: [_: "literal-string"]} :(scenario string_literal_escaped) recipe main [ 1:address:array:character <- copy [abc \[def] ] -+parse: ingredient: {name: "abc [def", properties: ["abc [def": "literal-string"]} ++parse: ingredient: {name: "abc [def", properties: [_: "literal-string"]} + +:(scenario string_literal_escaped_comment_aware) +recipe main [ + 1:address:array:character <- copy [ +abc \\\[def] +] ++parse: ingredient: {name: "\nabc \[def", properties: [_: "literal-string"]} :(scenario string_literal_and_comment) recipe main [ 1:address:array:character <- copy [abc] # comment ] +parse: instruction: copy -+parse: ingredient: {name: "abc", properties: ["abc": "literal-string"]} ++parse: ingredient: {name: "abc", properties: [_: "literal-string"]} +parse: product: {name: "1", properties: ["1": "address":"array":"character"]} # no other ingredients $parse: 3 + +:(scenario string_literal_escapes_newlines_in_trace) +recipe main [ + copy [abc +def] +] ++parse: ingredient: {name: "abc\ndef", properties: [_: "literal-string"]} + +:(scenario string_literal_can_skip_past_comments) +recipe main [ + copy [ + # ']' inside comment + bar + ] +] ++parse: ingredient: {name: "\n # ']' inside comment\n bar\n ", properties: [_: "literal-string"]} + +:(scenario string_literal_empty) +recipe main [ + copy [] +] ++parse: ingredient: {name: "", properties: [_: "literal-string"]} diff --git a/html/014literal_noninteger.cc.html b/html/014literal_noninteger.cc.html index e49f12fc..f24ed9ac 100644 --- a/html/014literal_noninteger.cc.html +++ b/html/014literal_noninteger.cc.html @@ -12,12 +12,12 @@ diff --git a/html/014types.cc.html b/html/014types.cc.html index 3eac20ad..596ac7dc 100644 --- a/html/014types.cc.html +++ b/html/014types.cc.html @@ -12,14 +12,14 @@ diff --git a/html/020run.cc.html b/html/020run.cc.html index 497766fa..c9b0fa2e 100644 --- a/html/020run.cc.html +++ b/html/020run.cc.html @@ -12,16 +12,16 @@ @@ -90,11 +90,11 @@ void run(recipe_number r) void run_current_routine() { // curly on a separate line, because later layers will modify header -//? cerr << "AAA 6\n"; //? 2 +//? cerr << "AAA 6\n"; //? 3 while (!Current_routine->completed()) // later layers will modify condition { //? cerr << "AAA 7: " << current_step_index() << '\n'; //? 1 - // Running One Instruction. + // Running One Instruction if (current_instruction().is_label) { ++current_step_index(); continue; } trace(Initial_callstack_depth+Callstack_depth, "run") << current_instruction().to_string(); assert(Memory[0] == 0); @@ -108,6 +108,7 @@ void run_current_routine() // Instructions below will write to 'products'. vector<vector<double> > products; //? cerr << "AAA 8: " << current_instruction().operation << " ^" << Recipe[current_instruction().operation].name << "$\n"; //? 1 +//? cerr << "% " << current_recipe_name() << "/" << current_step_index() << ": " << Memory[1013] << ' ' << Memory[1014] << '\n'; //? 1 switch (current_instruction().operation) { // Primitive Recipe Implementations case COPY: { @@ -124,9 +125,10 @@ void run_current_routine() for (long long int i = 0; i < SIZE(current_instruction().products); ++i) { write_memory(current_instruction().products.at(i), products.at(i)); } + // End of Instruction ++current_step_index(); } -//? cerr << "AAA 9\n"; //? 1 +//? cerr << "AAA 9\n"; //? 2 stop_running_current_routine:; } @@ -198,13 +200,14 @@ load_permanently("cor :(code) // helper for tests void run(string form) { -//? cerr << "AAA 2\n"; //? 1 +//? cerr << "AAA 2\n"; //? 2 +//? cerr << form << '\n'; //? 1 vector<recipe_number> tmp = load(form); if (tmp.empty()) return; transform_all(); -//? cerr << "AAA 3\n"; //? 1 +//? cerr << "AAA 3\n"; //? 2 run(tmp.front()); -//? cerr << "YYY\n"; //? 1 +//? cerr << "YYY\n"; //? 2 } //:: Reading from memory, writing to memory. @@ -212,7 +215,7 @@ void run(string form)(reagent x) { //? cout << "read_memory: " << x.to_string() << '\n'; //? 2 vector<double> result; - if (isa_literal(x)) { + if (is_literal(x)) { result.push_back(x.value); return result; } @@ -228,9 +231,11 @@ vector<double> read_memory(reagent x(reagent x, vector<double> data) { if (is_dummy(x)) return; + if (is_literal(x)) return; long long int base = x.value; - if (size_of(x) != SIZE(data)) - raise << "size mismatch in storing to " << x.to_string() << '\n'; + if (size_mismatch(x, data)) { + raise << current_recipe_name() << ": size mismatch in storing to " << x.to_string() << " at " << current_instruction().to_string() << '\n' << die(); + } for (long long int offset = 0; offset < SIZE(data); ++offset) { trace(Primitive_recipe_depth, "mem") << "storing " << data.at(offset) << " in location " << base+offset; Memory[base+offset] = data.at(offset); @@ -246,11 +251,15 @@ long long int size_of(const vector<type_number return 1; } +bool size_mismatch(const reagent& x, const vector<double>& data) { + return size_of(x) != SIZE(data); +} + bool is_dummy(const reagent& x) { return x.name == "_"; } -bool isa_literal(const reagent& r) { +bool is_literal(const reagent& r) { return SIZE(r.types) == 1 && r.types.at(0) == 0; } @@ -269,6 +278,12 @@ recipe main [ _ <- copy 0:literal ] +run: _ <- copy 0:literal + +:(scenario run_literal) +recipe main [ + 0:literal/screen <- copy 0:literal +] +-mem: storing 0 in location 0 diff --git a/html/021arithmetic.cc.html b/html/021arithmetic.cc.html index 69c07668..479a6f4c 100644 --- a/html/021arithmetic.cc.html +++ b/html/021arithmetic.cc.html @@ -12,11 +12,11 @@ diff --git a/html/022boolean.cc.html b/html/022boolean.cc.html index 836117eb..c5b5bcff 100644 --- a/html/022boolean.cc.html +++ b/html/022boolean.cc.html @@ -12,11 +12,11 @@ diff --git a/html/023jump.cc.html b/html/023jump.cc.html index 3f66359a..9a8206a8 100644 --- a/html/023jump.cc.html +++ b/html/023jump.cc.html @@ -12,14 +12,14 @@ diff --git a/html/024compare.cc.html b/html/024compare.cc.html index 86581fda..fb97b2a0 100644 --- a/html/024compare.cc.html +++ b/html/024compare.cc.html @@ -12,11 +12,11 @@ diff --git a/html/025trace.cc.html b/html/025trace.cc.html index 5af8da24..11c3c6bd 100644 --- a/html/025trace.cc.html +++ b/html/025trace.cc.html @@ -12,11 +12,11 @@ @@ -43,9 +43,9 @@ TRACE, Recipe_number["trace"] = TRACE; :(before "End Primitive Recipe Implementations") case TRACE: { - assert(isa_literal(current_instruction().ingredients.at(0))); + assert(is_literal(current_instruction().ingredients.at(0))); string label = current_instruction().ingredients.at(0).name; - assert(isa_literal(current_instruction().ingredients.at(1))); + assert(is_literal(current_instruction().ingredients.at(1))); string message = current_instruction().ingredients.at(1).name; trace(1, label) << message; break; diff --git a/html/026assert.cc.html b/html/026assert.cc.html index 0f86b9bf..685cf2e4 100644 --- a/html/026assert.cc.html +++ b/html/026assert.cc.html @@ -12,11 +12,11 @@ @@ -46,7 +46,7 @@ case ASSERT: { assert(SIZE(ingredients) == 2); assert(scalar(ingredients.at(0))); if (!ingredients.at(0).at(0)) { - assert(isa_literal(current_instruction().ingredients.at(1))); + assert(is_literal(current_instruction().ingredients.at(1))); raise << current_instruction().ingredients.at(1).name << '\n' << die(); } break; diff --git a/html/027debug.cc.html b/html/027debug.cc.html index 5dbf28a9..994729c2 100644 --- a/html/027debug.cc.html +++ b/html/027debug.cc.html @@ -12,12 +12,12 @@ @@ -38,7 +38,7 @@ Recipe_number["$print"] = _PRINT:(before "End Primitive Recipe Implementations") case _PRINT: { for (long long int i = 0; i < SIZE(ingredients); ++i) { - if (isa_literal(current_instruction().ingredients.at(i))) { + if (is_literal(current_instruction().ingredients.at(i))) { trace(Primitive_recipe_depth, "run") << "$print: " << current_instruction().ingredients.at(i).name; cout << current_instruction().ingredients.at(i).name; } diff --git a/html/030container.cc.html b/html/030container.cc.html index 851c5357..4531e5da 100644 --- a/html/030container.cc.html +++ b/html/030container.cc.html @@ -12,17 +12,17 @@ @@ -143,8 +143,9 @@ case GET: { reagent base = current_instruction().ingredients.at(0); long long int base_address = base.value; type_number base_type = base.types.at(0); - assert(Type[base_type].kind == container); - assert(isa_literal(current_instruction().ingredients.at(1))); + if (Type[base_type].kind != container) + raise << "'get' on a non-container in " << current_recipe_name () << ": " << current_instruction().to_string() << '\n' << die(); + assert(is_literal(current_instruction().ingredients.at(1))); assert(scalar(ingredients.at(1))); long long int offset = ingredients.at(1).at(0); long long int src = base_address; @@ -155,7 +156,7 @@ case GET: { assert(Type[base_type].kind == container); assert(SIZE(Type[base_type].elements) > offset); type_number src_type = Type[base_type].elements.at(offset).at(0); - trace(Primitive_recipe_depth, "run") << "its type is " << src_type; + trace(Primitive_recipe_depth, "run") << "its type is " << Type[src_type].name; reagent tmp; tmp.set_value(src); tmp.types.push_back(src_type); @@ -191,8 +192,9 @@ case GET_ADDRESS: { reagent base = current_instruction().ingredients.at(0); long long int base_address = base.value; type_number base_type = base.types.at(0); - assert(Type[base_type].kind == container); - assert(isa_literal(current_instruction().ingredients.at(1))); + if (Type[base_type].kind != container) + raise << "'get' on a non-container in " << current_recipe_name () << ": " << current_instruction().to_string() << '\n' << die(); + assert(is_literal(current_instruction().ingredients.at(1))); assert(scalar(ingredients.at(1))); long long int offset = ingredients.at(1).at(0); long long int result = base_address; @@ -405,6 +407,33 @@ void check_container_field_types() } } +//:: Construct types out of their constituent fields. Doesn't currently do +//:: type-checking but *does* match sizes. +:(before "End Primitive Recipe Declarations") +MERGE, +:(before "End Primitive Recipe Numbers") +Recipe_number["merge"] = MERGE; +:(before "End Primitive Recipe Implementations") +case MERGE: { + products.resize(1); + for (long long int i = 0; i < SIZE(ingredients); ++i) + for (long long int j = 0; j < SIZE(ingredients.at(i)); ++j) + 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:literal, 4:literal +] ++mem: storing 3 in location 1 ++mem: storing 4 in location 2 + //:: helpers :(code) diff --git a/html/031address.cc.html b/html/031address.cc.html index 88e8c294..04ee869d 100644 --- a/html/031address.cc.html +++ b/html/031address.cc.html @@ -12,15 +12,15 @@ @@ -61,7 +61,7 @@ x = canonize(x); :(code) reagent canonize(reagent x) { - if (isa_literal(x)) return x; + if (is_literal(x)) return x; //? cout << "canonize\n"; //? 1 reagent r = x; //? cout << x.to_string() << " => " << r.to_string() << '\n'; //? 1 diff --git a/html/032array.cc.html b/html/032array.cc.html index f0850f2f..27cef879 100644 --- a/html/032array.cc.html +++ b/html/032array.cc.html @@ -12,16 +12,16 @@ @@ -73,8 +73,8 @@ recipe main [ +mem: storing 16 in location 9 //: disable the size mismatch check since the destination array need not be initialized -:(replace "if (size_of(x) != SIZE(data))" following "void write_memory(reagent x, vector<double> data)") -if (x.types.at(0) != Type_number["array"] && size_of(x) != SIZE(data)) +:(after "bool size_mismatch(const reagent& x, const vector<double>& data)") +if (x.types.at(0) == Type_number["array"]) return false; :(after "long long int size_of(const reagent& r)") if (r.types.at(0) == Type_number["array"]) { assert(SIZE(r.types) > 1); @@ -124,7 +124,7 @@ case INDEX: { //? trace(Primitive_recipe_depth, "run") << "size of elements: " << size_of(element_type); //? 1 long long int src = base_address + 1 + offset_val.at(0)*size_of(element_type); trace(Primitive_recipe_depth, "run") << "address to copy is " << src; - trace(Primitive_recipe_depth, "run") << "its type is " << element_type.at(0); + trace(Primitive_recipe_depth, "run") << "its type is " << Type[element_type.at(0)].name; reagent tmp; tmp.set_value(src); copy(element_type.begin(), element_type.end(), inserter(tmp.types, tmp.types.begin())); diff --git a/html/033length.cc.html b/html/033length.cc.html index e0b21238..033a29f2 100644 --- a/html/033length.cc.html +++ b/html/033length.cc.html @@ -12,11 +12,11 @@ @@ -129,7 +129,7 @@ case MAYBE_CONVERT: { long long int base_address = base.value; type_number base_type = base.types.at(0); assert(Type[base_type].kind == exclusive_container); - assert(isa_literal(current_instruction().ingredients.at(1))); + assert(is_literal(current_instruction().ingredients.at(1))); long long int tag = current_instruction().ingredients.at(1).value; long long int result; if (tag == static_cast<long long int>(Memory[base_address])) { @@ -160,6 +160,23 @@ exclusive-container foo [ else if (command == "exclusive-container") { insert_container(command, exclusive_container, in); } + +//:: To construct exclusive containers out of variant types, use 'merge'. +:(scenario lift_to_exclusive_container) +exclusive-container foo [ + x:number + y:number +] + +recipe main [ + 1:number <- copy 34:literal + 2:foo <- merge 0:literal/x, 1:number + 4:foo <- merge 1:literal/x, 1:number +] ++mem: storing 0 in location 2 ++mem: storing 34 in location 3 ++mem: storing 1 in location 4 ++mem: storing 34 in location 5 diff --git a/html/035call.cc.html b/html/035call.cc.html index c493e9dc..9cab8e21 100644 --- a/html/035call.cc.html +++ b/html/035call.cc.html @@ -12,17 +12,17 @@ diff --git a/html/036call_ingredient.cc.html b/html/036call_ingredient.cc.html index 995bbbcf..c19b4166 100644 --- a/html/036call_ingredient.cc.html +++ b/html/036call_ingredient.cc.html @@ -12,11 +12,11 @@ @@ -127,7 +127,7 @@ INGREDIENT, Recipe_number["ingredient"] = INGREDIENT; :(before "End Primitive Recipe Implementations") case INGREDIENT: { - assert(isa_literal(current_instruction().ingredients.at(0))); + assert(is_literal(current_instruction().ingredients.at(0))); assert(scalar(ingredients.at(0))); if (static_cast<long long int>(ingredients.at(0).at(0)) < SIZE(Current_routine->calls.front().ingredient_atoms)) { Current_routine->calls.front().next_ingredient_to_process = ingredients.at(0).at(0); diff --git a/html/037call_reply.cc.html b/html/037call_reply.cc.html index 711bc8c4..82517f08 100644 --- a/html/037call_reply.cc.html +++ b/html/037call_reply.cc.html @@ -12,14 +12,14 @@ @@ -53,6 +53,7 @@ Recipe_number["reply"] = REPLY:(before "End Primitive Recipe Implementations") case REPLY: { const instruction& reply_inst = current_instruction(); // save pointer into recipe before pop + const string& callee = current_recipe_name(); --Callstack_depth; //? if (tb_is_active()) { //? 1 //? tb_clear(); //? 1 @@ -74,7 +75,7 @@ case REPLY: { assert(SIZE(tmp) == 1); long long int ingredient_index = to_integer(tmp.at(0)); if (caller_instruction.products.at(i).value != caller_instruction.ingredients.at(ingredient_index).value) - raise << "'same-as-ingredient' result " << caller_instruction.products.at(i).value << " must be location " << caller_instruction.ingredients.at(ingredient_index).value << '\n'; + raise << current_recipe_name() << ": 'same-as-ingredient' result " << caller_instruction.products.at(i).value << " from call to " << callee << " must be location " << caller_instruction.ingredients.at(ingredient_index).value << '\n'; } } break; // continue to process rest of *caller* instruction @@ -109,7 +110,7 @@ recipe test1 [ 10:address:number <- next-ingredient reply 10:address:number/same-as-ingredient:0 ] -+warn: 'same-as-ingredient' result 2 must be location 1 ++warn: main: 'same-as-ingredient' result 2 from call to test1 must be location 1 :(code) string to_string(const vector<double>& in) { @@ -159,6 +160,7 @@ recipe test1 [ if (curr.name == "reply-if") { assert(curr.products.empty()); curr.operation = Recipe_number["jump-unless"]; + curr.name = "jump-unless"; vector<reagent> results; copy(++curr.ingredients.begin(), curr.ingredients.end(), inserter(results, results.end())); curr.ingredients.resize(1); @@ -166,6 +168,26 @@ if (curr.name == < result.steps.push_back(curr); curr.clear(); curr.operation = Recipe_number["reply"]; + curr.name = "reply"; + curr.ingredients.swap(results); +} +// rewrite `reply-unless a, b, c, ...` to +// ``` +// jump-if a, 1:offset +// reply b, c, ... +// ``` +if (curr.name == "reply-unless") { + assert(curr.products.empty()); + curr.operation = Recipe_number["jump-if"]; + curr.name = "jump-if"; + vector<reagent> results; + copy(++curr.ingredients.begin(), curr.ingredients.end(), inserter(results, results.end())); + curr.ingredients.resize(1); + curr.ingredients.push_back(reagent("1:offset")); + result.steps.push_back(curr); + curr.clear(); + curr.operation = Recipe_number["reply"]; + curr.name = "reply"; curr.ingredients.swap(results); } diff --git a/html/038scheduler.cc.html b/html/038scheduler.cc.html index 6dda74ca..80316b38 100644 --- a/html/038scheduler.cc.html +++ b/html/038scheduler.cc.html @@ -12,16 +12,16 @@ @@ -80,6 +80,7 @@ long long int Current_routine_index = 0500; :(before "End Setup") Scheduling_interval = 500; +Routines.clear(); :(replace{} "void run(recipe_number r)") void run(recipe_number r) { //? cerr << "AAA 4\n"; //? 1 @@ -179,7 +180,7 @@ START_RUNNING, Recipe_number["start-running"] = START_RUNNING; :(before "End Primitive Recipe Implementations") case START_RUNNING: { - assert(isa_literal(current_instruction().ingredients.at(0))); + assert(is_literal(current_instruction().ingredients.at(0))); assert(!current_instruction().ingredients.at(0).initialized); routine* new_routine = new routine(Recipe_number[current_instruction().ingredients.at(0).name]); //? cerr << new_routine->id << " -> " << Current_routine->id << '\n'; //? 1 diff --git a/html/039wait.cc.html b/html/039wait.cc.html index 92798fcd..57dd3e75 100644 --- a/html/039wait.cc.html +++ b/html/039wait.cc.html @@ -12,14 +12,14 @@ diff --git a/html/040brace.cc.html b/html/040brace.cc.html index 9b81bc98..eb7f66a9 100644 --- a/html/040brace.cc.html +++ b/html/040brace.cc.html @@ -12,14 +12,14 @@ @@ -98,7 +98,7 @@ void transform_braces(const recipe_number r; // do nothing else if (inst.operation == Recipe_number["loop"]) { inst.operation = Recipe_number["jump"]; - if (!inst.ingredients.empty() && isa_literal(inst.ingredients.at(0))) { + if (!inst.ingredients.empty() && is_literal(inst.ingredients.at(0))) { // explicit target; a later phase will handle it trace("after-brace") << "jump " << inst.ingredients.at(0).name << ":offset"; } @@ -114,7 +114,7 @@ void transform_braces(const recipe_number r} else if (inst.operation == Recipe_number["break"]) { inst.operation = Recipe_number["jump"]; - if (!inst.ingredients.empty() && isa_literal(inst.ingredients.at(0))) { + if (!inst.ingredients.empty() && is_literal(inst.ingredients.at(0))) { // explicit target; a later phase will handle it trace("after-brace") << "jump " << inst.ingredients.at(0).name << ":offset"; } @@ -128,7 +128,7 @@ void transform_braces(const recipe_number r} else if (inst.operation == Recipe_number["loop-if"]) { inst.operation = Recipe_number["jump-if"]; - if (SIZE(inst.ingredients) > 1 && isa_literal(inst.ingredients.at(1))) { + if (SIZE(inst.ingredients) > 1 && is_literal(inst.ingredients.at(1))) { // explicit target; a later phase will handle it trace("after-brace") << "jump " << inst.ingredients.at(1).name << ":offset"; } @@ -142,7 +142,7 @@ void transform_braces(const recipe_number r} else if (inst.operation == Recipe_number["break-if"]) { inst.operation = Recipe_number["jump-if"]; - if (SIZE(inst.ingredients) > 1 && isa_literal(inst.ingredients.at(1))) { + if (SIZE(inst.ingredients) > 1 && is_literal(inst.ingredients.at(1))) { // explicit target; a later phase will handle it trace("after-brace") << "jump " << inst.ingredients.at(1).name << ":offset"; } @@ -156,7 +156,7 @@ void transform_braces(const recipe_number r} else if (inst.operation == Recipe_number["loop-unless"]) { inst.operation = Recipe_number["jump-unless"]; - if (SIZE(inst.ingredients) > 1 && isa_literal(inst.ingredients.at(1))) { + if (SIZE(inst.ingredients) > 1 && is_literal(inst.ingredients.at(1))) { // explicit target; a later phase will handle it trace("after-brace") << "jump " << inst.ingredients.at(1).name << ":offset"; } @@ -171,7 +171,7 @@ void transform_braces(const recipe_number r(inst.operation == Recipe_number["break-unless"]) { //? cout << "AAA break-unless\n"; //? 1 inst.operation = Recipe_number["jump-unless"]; - if (SIZE(inst.ingredients) > 1 && isa_literal(inst.ingredients.at(1))) { + if (SIZE(inst.ingredients) > 1 && is_literal(inst.ingredients.at(1))) { // explicit target; a later phase will handle it trace("after-brace") << "jump " << inst.ingredients.at(1).name << ":offset"; } diff --git a/html/041name.cc.html b/html/041name.cc.html index 76fa114e..5dd8195e 100644 --- a/html/041name.cc.html +++ b/html/041name.cc.html @@ -12,17 +12,17 @@ @@ -103,7 +103,7 @@ void transform_names(const recipe_number r} void check_metadata(map<string, vector<type_number> >& metadata, const reagent& x, const recipe_number r) { - if (isa_literal(x)) return; + if (is_literal(x)) return; if (is_raw(x)) return; if (metadata.find(x.name) == metadata.end()) metadata[x.name] = x.types; @@ -112,11 +112,12 @@ void check_metadata(map<string} bool disqualified(/*mutable*/ reagent& x) { +//? cerr << x.to_string() << '\n'; //? 1 if (x.types.empty()) raise << "missing type in " << x.to_string() << '\n'; assert(!x.types.empty()); if (is_raw(x)) return true; - if (isa_literal(x)) return true; + if (is_literal(x)) return true; if (is_integer(x.name)) return true; // End Disqualified Reagents if (x.initialized) return true; @@ -145,19 +146,19 @@ int find_element_name(const type_number t(long long int i = 0; i < SIZE(container.element_names); ++i) { if (container.element_names.at(i) == name) return i; } - raise << "unknown element " << name << " in container " << t << '\n' << die(); + raise << "unknown element " << name << " in container " << Type[t].name << '\n' << die(); return -1; } bool is_numeric_location(const reagent& x) { - if (isa_literal(x)) return false; + if (is_literal(x)) return false; if (is_raw(x)) return false; if (x.name == "0") return false; // used for chaining lexical scopes return is_integer(x.name); } bool is_named_location(const reagent& x) { - if (isa_literal(x)) return false; + if (is_literal(x)) return false; if (is_raw(x)) return false; if (is_special_name(x.name)) return false; return !is_integer(x.name); @@ -258,7 +259,7 @@ if (inst.operation // at least 2 args, and second arg is offset assert(SIZE(inst.ingredients) >= 2); //? cout << inst.ingredients.at(1).to_string() << '\n'; //? 1 - assert(isa_literal(inst.ingredients.at(1))); + assert(is_literal(inst.ingredients.at(1))); if (inst.ingredients.at(1).name.find_first_not_of("0123456789") == string::npos) continue; // since first non-address in base type must be a container, we don't have to canonize type_number base_type = skip_addresses(inst.ingredients.at(0).types); @@ -294,7 +295,7 @@ recipe main [ if (inst.operation == Recipe_number["maybe-convert"]) { // at least 2 args, and second arg is offset assert(SIZE(inst.ingredients) >= 2); - assert(isa_literal(inst.ingredients.at(1))); + assert(is_literal(inst.ingredients.at(1))); if (inst.ingredients.at(1).name.find_first_not_of("0123456789") == string::npos) continue; // since first non-address in base type must be an exclusive container, we don't have to canonize type_number base_type = skip_addresses(inst.ingredients.at(0).types); diff --git a/html/042new.cc.html b/html/042new.cc.html index f1ca46a1..aaa6f2bf 100644 --- a/html/042new.cc.html +++ b/html/042new.cc.html @@ -12,16 +12,15 @@ @@ -71,14 +70,15 @@ if (inst.operation // End NEW Transform Special-cases // first arg must be of type 'type' assert(SIZE(inst.ingredients) >= 1); - assert(isa_literal(inst.ingredients.at(0))); + if (!is_literal(inst.ingredients.at(0))) + raise << "expected literal, got " << inst.ingredients.at(0).to_string() << '\n' << die(); if (inst.ingredients.at(0).properties.at(0).second.at(0) != "type") raise << "tried to allocate non-type " << inst.ingredients.at(0).to_string() << " in recipe " << Recipe[r].name << '\n' << die(); if (Type_number.find(inst.ingredients.at(0).name) == Type_number.end()) raise << "unknown type " << inst.ingredients.at(0).name << " in recipe " << Recipe[r].name << '\n' << die(); //? cerr << "type " << inst.ingredients.at(0).name << " => " << Type_number[inst.ingredients.at(0).name] << '\n'; //? 1 inst.ingredients.at(0).set_value(Type_number[inst.ingredients.at(0).name]); - trace(Primitive_recipe_depth, "new") << inst.ingredients.at(0).name << " -> " << inst.ingredients.at(0).value; + trace(Primitive_recipe_depth, "new") << inst.ingredients.at(0).name << " -> " << inst.ingredients.at(0).name; end_new_transform:; } @@ -96,7 +96,7 @@ case NEW: { long long int array_length = 0; { vector<type_number> type; - assert(isa_literal(current_instruction().ingredients.at(0))); + assert(is_literal(current_instruction().ingredients.at(0))); type.push_back(current_instruction().ingredients.at(0).value); //? trace(Primitive_recipe_depth, "mem") << "type " << current_instruction().ingredients.at(0).to_string() << ' ' << type.size() << ' ' << type.back() << " has size " << size_of(type); //? 1 if (SIZE(current_instruction().ingredients) > 1) { @@ -166,6 +166,16 @@ recipe main [ # don't forget the extra location for array size +mem: storing 6 in location 3 +:(scenario new_empty_array) +recipe main [ + 1:address:array:number/raw <- new number:type, 0:literal + 2:address:number/raw <- new number:type + 3:number/raw <- subtract 2:address:number/raw, 1:address:array:number/raw +] ++run: 1:address:array:number/raw <- new number:type, 0:literal ++mem: array size is 0 ++mem: storing 1 in location 3 + //: Make sure that each routine gets a different alloc to start. :(scenario new_concurrent) recipe f1 [ @@ -216,14 +226,17 @@ recipe main [ +mem: storing 171 in location 3 :(before "End NEW Transform Special-cases") - if (inst.ingredients.at(0).properties.at(0).second.at(0) == "literal-string") { + if (!inst.ingredients.empty() + && !inst.ingredients.at(0).properties.empty() + && !inst.ingredients.at(0).properties.at(0).second.empty() + && inst.ingredients.at(0).properties.at(0).second.at(0) == "literal-string") { // skip transform inst.ingredients.at(0).initialized = true; goto end_new_transform; } :(after "case NEW" following "Primitive Recipe Implementations") -if (isa_literal(current_instruction().ingredients.at(0)) +if (is_literal(current_instruction().ingredients.at(0)) && current_instruction().ingredients.at(0).properties.at(0).second.at(0) == "literal-string") { // allocate an array just large enough for it long long int string_length = unicode_length(current_instruction().ingredients.at(0).name); @@ -272,9 +285,6 @@ long long int unicode_length(const string& s< } return result; } - -:(before "End Includes") -#include"termbox/termbox.h" // for unicode primitives diff --git a/html/043space.cc.html b/html/043space.cc.html index 005e1e9e..df051ab3 100644 --- a/html/043space.cc.html +++ b/html/043space.cc.html @@ -12,17 +12,17 @@ diff --git a/html/044space_surround.cc.html b/html/044space_surround.cc.html index c82e9e2f..575f33bb 100644 --- a/html/044space_surround.cc.html +++ b/html/044space_surround.cc.html @@ -12,13 +12,13 @@ diff --git a/html/045closure_name.cc.html b/html/045closure_name.cc.html index d3aa6f01..30ed6538 100644 --- a/html/045closure_name.cc.html +++ b/html/045closure_name.cc.html @@ -12,14 +12,14 @@ @@ -40,14 +40,14 @@ body { font-family: monospace; color: #eeeeee; background-color: #080808; } :(scenario closure) recipe main [ default-space:address:array:location <- new location:type, 30:literal - 1:address:array:location/names:init-counter <- init-counter + 1:address:array:location/names:new-counter <- new-counter #? $print [AAAAAAAAAAAAAAAA] #? $print 1:address:array:location - 2:number/raw <- increment-counter 1:address:array:location/names:init-counter - 3:number/raw <- increment-counter 1:address:array:location/names:init-counter + 2:number/raw <- increment-counter 1:address:array:location/names:new-counter + 3:number/raw <- increment-counter 1:address:array:location/names:new-counter ] -recipe init-counter [ +recipe new-counter [ default-space:address:array:location <- new location:type, 30:literal x:number <- copy 23:literal y:number <- copy 3:literal # variable that will be incremented @@ -56,13 +56,13 @@ recipe init-counter [ recipe increment-counter [ default-space:address:array:location <- new location:type, 30:literal - 0:address:array:location/names:init-counter <- next-ingredient # outer space must be created by 'init-counter' above + 0:address:array:location/names:new-counter <- next-ingredient # outer space must be created by 'new-counter' above y:number/space:1 <- add y:number/space:1, 1:literal # increment y:number <- copy 234:literal # dummy reply y:number/space:1 ] -+name: recipe increment-counter is surrounded by init-counter ++name: recipe increment-counter is surrounded by new-counter +mem: storing 5 in location 3 //: To make this work, compute the recipe that provides names for the @@ -80,7 +80,7 @@ void collect_surrounding_spaces(const recipe_numb const instruction& inst = Recipe[r].steps.at(i); if (inst.is_label) continue; for (long long int j = 0; j < SIZE(inst.products); ++j) { - if (isa_literal(inst.products.at(j))) continue; + if (is_literal(inst.products.at(j))) continue; if (inst.products.at(j).name != "0") continue; if (SIZE(inst.products.at(j).types) != 3 || inst.products.at(j).types.at(0) != Type_number["address"] diff --git a/html/046tangle.cc.html b/html/046tangle.cc.html index 40afd84d..2bf8d51c 100644 --- a/html/046tangle.cc.html +++ b/html/046tangle.cc.html @@ -12,14 +12,14 @@ diff --git a/html/047jump_label.cc.html b/html/047jump_label.cc.html index abff627d..2c53c4d8 100644 --- a/html/047jump_label.cc.html +++ b/html/047jump_label.cc.html @@ -12,15 +12,15 @@ @@ -82,7 +82,7 @@ void transform_labels(const recipe_number r:(code) void replace_offset(reagent& x, /*const*/ map<string, long long int>& offset, const long long int current_offset, const recipe_number r) { //? cerr << "AAA " << x.to_string() << '\n'; //? 1 - assert(isa_literal(x)); + assert(is_literal(x)); //? cerr << "BBB " << x.to_string() << '\n'; //? 1 assert(!x.initialized); //? cerr << "CCC " << x.to_string() << '\n'; //? 1 diff --git a/html/048call_variable.cc.html b/html/048call_variable.cc.html index 404abffc..6bbbc545 100644 --- a/html/048call_variable.cc.html +++ b/html/048call_variable.cc.html @@ -12,13 +12,13 @@ diff --git a/html/049continuation.cc.html b/html/049continuation.cc.html index 9852638d..bb7b0f14 100644 --- a/html/049continuation.cc.html +++ b/html/049continuation.cc.html @@ -12,16 +12,16 @@ diff --git a/html/050scenario.cc.html b/html/050scenario.cc.html index 18576b21..ae05aa68 100644 --- a/html/050scenario.cc.html +++ b/html/050scenario.cc.html @@ -12,16 +12,16 @@ @@ -110,11 +110,18 @@ scenario parse_scenario(istream& in//? cerr << "parse scenario\n"; //? 1 scenario result; result.name = next_word(in); +//? cerr << "scenario: " << result.name << '\n'; //? 2 skip_whitespace_and_comments(in); assert(in.peek() == '['); // scenarios are take special 'code' strings so we need to ignore brackets // inside comments - result.to_run = slurp_quoted_ignoring_comments(in); + result.to_run = slurp_quoted(in); + // delete [] delimiters + assert(result.to_run.at(0) == '['); + result.to_run.erase(0, 1); +//? cerr << (int)result.to_run.at(SIZE(result.to_run)-1) << '\n'; //? 1 + assert(result.to_run.at(SIZE(result.to_run)-1) == ']'); + result.to_run.erase(SIZE(result.to_run)-1); return result; } @@ -161,13 +168,16 @@ const scenario* Current_scenario = NULL(const scenario& s) { Current_scenario = &s; bool not_already_inside_test = !Trace_stream; +//? cerr << s.name << '\n'; //? 4 if (not_already_inside_test) { Trace_file = s.name; Trace_stream = new trace_stream; setup(); } -//? cerr << '^' << s.to_run << "$\n"; //? 1 +//? cerr << '^' << s.to_run << "$\n"; //? 4 + assert(Routines.empty()); run("recipe "+s.name+" [ " + s.to_run + " ]"); +//? cerr << s.name << " done\n"; //? 1 if (not_already_inside_test && Trace_stream) { teardown(); ofstream fout((Trace_dir+Trace_file).c_str()); @@ -557,36 +567,6 @@ void run_mu_scenario(const string& form(in); run_mu_scenario(s); } - -string slurp_quoted_ignoring_comments(istream& in) { - assert(in.get() == '['); // drop initial '[' - char c; - ostringstream out; - while (in >> c) { -//? cerr << c << '\n'; //? 3 - if (c == '#') { - // skip comment - in.putback(c); - skip_comment(in); - continue; - } - if (c == '[') { - // nested strings won't detect comments - // can't yet handle scenarios inside strings inside scenarios.. - in.putback(c); - out << slurp_quoted(in); -//? cerr << "snapshot: ^" << out.str() << "$\n"; //? 1 - continue; - } - if (c == ']') { - // must be at the outermost level; drop final ']' - break; - } - out << c; - } -//? cerr << "done\n"; //? 2 - return out.str(); -} diff --git a/html/051scenario_test.mu.html b/html/051scenario_test.mu.html index 1b65f9a3..4a996b81 100644 --- a/html/051scenario_test.mu.html +++ b/html/051scenario_test.mu.html @@ -12,10 +12,10 @@ diff --git a/html/060string.mu.html b/html/060string.mu.html index 43ecdd77..06164424 100644 --- a/html/060string.mu.html +++ b/html/060string.mu.html @@ -12,14 +12,14 @@ @@ -137,7 +137,7 @@ container buffer [ data:address:array:character ] -recipe init-buffer [ +recipe new-buffer [ default-space:address:array:location <- new location:type, 30:literal #? $print default-space:address:array:location, [ #? ] @@ -216,7 +216,7 @@ container buffer [ scenario buffer-append-works [ run [ default-space:address:array:location <- new location:type, 30:literal - x:address:buffer <- init-buffer 3:literal + x:address:buffer <- new-buffer 3:literal s1:address:array:character <- get x:address:buffer/deref, data:offset x:address:buffer <- buffer-append x:address:buffer, 97:literal # 'a' x:address:buffer <- buffer-append x:address:buffer, 98:literal # 'b' @@ -268,7 +268,7 @@ container buffer [ scenario buffer-append-handles-backspace [ run [ default-space:address:array:location <- new location:type, 30:literal - x:address:buffer <- init-buffer 3:literal + x:address:buffer <- new-buffer 3:literal x:address:buffer <- buffer-append x:address:buffer, 97:literal # 'a' x:address:buffer <- buffer-append x:address:buffer, 98:literal # 'b' x:address:buffer <- buffer-append x:address:buffer, 8:literal/backspace @@ -301,7 +301,7 @@ container buffer [ n:number <- multiply n:number, -1:literal } # add digits from right to left into intermediate buffer - tmp:address:buffer <- init-buffer 30:literal + tmp:address:buffer <- new-buffer 30:literal digit-base:number <- copy 48:literal # '0' { done?:boolean <- equal n:number, 0:literal @@ -756,6 +756,566 @@ container buffer [ 3:string <- [abc] ] ] + +# next-index:number <- find-next text:address:array:character, pattern:character +recipe find-next [ + default-space:address:array:location <- new location:type, 30:literal + text:address:array:character <- next-ingredient + pattern:character <- next-ingredient + idx:number <- next-ingredient + len:number <- length text:address:array:character/deref + { + eof?:boolean <- greater-or-equal idx:number, len:number + break-if eof?:boolean + curr:character <- index text:address:array:character/deref, idx:number + found?:boolean <- equal curr:character, pattern:character + break-if found?:boolean + idx:number <- add idx:number, 1:literal + loop + } + reply idx:number +] + +scenario string-find-next [ + run [ + 1:address:array:character <- new [a/b] + 2:number <- find-next 1:address:array:character, 47:literal/slash, 0:literal/start-index + ] + memory-should-contain [ + 2 <- 1 + ] +] + +scenario string-find-next-empty [ + run [ + 1:address:array:character <- new [] + 2:number <- find-next 1:address:array:character, 47:literal/slash, 0:literal/start-index + ] + memory-should-contain [ + 2 <- 0 + ] +] + +scenario string-find-next-initial [ + run [ + 1:address:array:character <- new [/abc] + 2:number <- find-next 1:address:array:character, 47:literal/slash, 0:literal/start-index + ] + memory-should-contain [ + 2 <- 0 # prefix match + ] +] + +scenario string-find-next-final [ + run [ + 1:address:array:character <- new [abc/] + 2:number <- find-next 1:address:array:character, 47:literal/slash, 0:literal/start-index + ] + memory-should-contain [ + 2 <- 3 # suffix match + ] +] + +scenario string-find-next-missing [ + run [ + 1:address:array:character <- new [abc] + 2:number <- find-next 1:address:array:character, 47:literal/slash, 0:literal/start-index + ] + memory-should-contain [ + 2 <- 3 # no match + ] +] + +scenario string-find-next-invalid-index [ + run [ + 1:address:array:character <- new [abc] + 2:number <- find-next 1:address:array:character, 47:literal/slash, 4:literal/start-index + ] + memory-should-contain [ + 2 <- 4 # no change + ] +] + +scenario string-find-next-first [ + run [ + 1:address:array:character <- new [ab/c/] + 2:number <- find-next 1:address:array:character, 47:literal/slash, 0:literal/start-index + ] + memory-should-contain [ + 2 <- 2 # first '/' of multiple + ] +] + +scenario string-find-next-second [ + run [ + 1:address:array:character <- new [ab/c/] + 2:number <- find-next 1:address:array:character, 47:literal/slash, 3:literal/start-index + ] + memory-should-contain [ + 2 <- 4 # second '/' of multiple + ] +] + +# like find-next, but searches for multiple characters +# fairly dumb algorithm +recipe find-substring [ + default-space:address:array:location <- new location:type, 30:literal + text:address:array:character <- next-ingredient + pattern:address:array:character <- next-ingredient + idx:number <- next-ingredient + first:character <- index pattern:address:array:character/deref, 0:literal + # repeatedly check for match at current idx + len:number <- length text:address:array:character/deref + { + # does some unnecessary work checking for substrings even when there isn't enough of text left + done?:boolean <- greater-or-equal idx:number, len:number + break-if done?:boolean + found?:boolean <- match-at text:address:array:character pattern:address:array:character, idx:number + break-if found?:boolean + idx:number <- add idx:number, 1:literal + # optimization: skip past indices that definitely won't match + idx:number <- find-next text:address:array:character, first:character, idx:number + loop + } + reply idx:number +] + +scenario find-substring-1 [ + run [ + 1:address:array:character <- new [abc] + 2:address:array:character <- new [bc] + 3:number <- find-substring 1:address:array:character, 2:address:array:character, 0:literal + ] + memory-should-contain [ + 3 <- 1 + ] +] + +scenario find-substring-2 [ + run [ + 1:address:array:character <- new [abcd] + 2:address:array:character <- new [bc] + 3:number <- find-substring 1:address:array:character, 2:address:array:character, 1:literal + ] + memory-should-contain [ + 3 <- 1 + ] +] + +scenario find-substring-no-match [ + run [ + 1:address:array:character <- new [abc] + 2:address:array:character <- new [bd] + 3:number <- find-substring 1:address:array:character, 2:address:array:character, 0:literal + ] + memory-should-contain [ + 3 <- 3 # not found + ] +] + +scenario find-substring-suffix-match [ + run [ + 1:address:array:character <- new [abcd] + 2:address:array:character <- new [cd] + 3:number <- find-substring 1:address:array:character, 2:address:array:character, 0:literal + ] + memory-should-contain [ + 3 <- 2 + ] +] + +scenario find-substring-suffix-match-2 [ + run [ + 1:address:array:character <- new [abcd] + 2:address:array:character <- new [cde] + 3:number <- find-substring 1:address:array:character, 2:address:array:character, 0:literal + ] + memory-should-contain [ + 3 <- 4 # not found + ] +] + +# result:boolean <- match-at text:address:array:character, pattern:address:array:character, idx:number +# checks if substring matches at index 'idx' +recipe match-at [ + default-space:address:array:location <- new location:type, 30:literal + text:address:array:character <- next-ingredient + pattern:address:array:character <- next-ingredient + idx:number <- next-ingredient + pattern-len:number <- length pattern:address:array:character/deref + # check that there's space left for the pattern + { + x:number <- length text:address:array:character/deref + x:number <- subtract x:number, pattern-len:number + enough-room?:boolean <- lesser-or-equal idx:number, x:number + break-if enough-room?:boolean + reply 0:literal/not-found + } + # check each character of pattern + pattern-idx:number <- copy 0:literal + { + done?:boolean <- greater-or-equal pattern-idx:number, pattern-len:number + break-if done?:boolean + c:character <- index text:address:array:character/deref, idx:number + exp:character <- index pattern:address:array:character/deref, pattern-idx:number + { + match?:boolean <- equal c:character, exp:character + break-if match?:boolean + reply 0:literal/not-found + } + idx:number <- add idx:number, 1:literal + pattern-idx:number <- add pattern-idx:number, 1:literal + loop + } + reply 1:literal/found +] + +scenario match-at-checks-substring-at-index [ + run [ + 1:address:array:character <- new [abc] + 2:address:array:character <- new [ab] + 3:boolean <- match-at 1:address:array:character, 2:address:array:character, 0:literal + ] + memory-should-contain [ + 3 <- 1 # match found + ] +] + +scenario match-at-reflexive [ + run [ + 1:address:array:character <- new [abc] + 3:boolean <- match-at 1:address:array:character, 1:address:array:character, 0:literal + ] + memory-should-contain [ + 3 <- 1 # match found + ] +] + +scenario match-at-outside-bounds [ + run [ + 1:address:array:character <- new [abc] + 2:address:array:character <- new [a] + 3:boolean <- match-at 1:address:array:character, 2:address:array:character, 4:literal + ] + memory-should-contain [ + 3 <- 0 # never matches + ] +] + +scenario match-at-empty-pattern [ + run [ + 1:address:array:character <- new [abc] + 2:address:array:character <- new [] + 3:boolean <- match-at 1:address:array:character, 2:address:array:character, 0:literal + ] + memory-should-contain [ + 3 <- 1 # always matches empty pattern given a valid index + ] +] + +scenario match-at-empty-pattern-outside-bound [ + run [ + 1:address:array:character <- new [abc] + 2:address:array:character <- new [] + 3:boolean <- match-at 1:address:array:character, 2:address:array:character, 4:literal + ] + memory-should-contain [ + 3 <- 0 # no match + ] +] + +scenario match-at-empty-text [ + run [ + 1:address:array:character <- new [] + 2:address:array:character <- new [abc] + 3:boolean <- match-at 1:address:array:character, 2:address:array:character, 0:literal + ] + memory-should-contain [ + 3 <- 0 # no match + ] +] + +scenario match-at-empty-against-empty [ + run [ + 1:address:array:character <- new [] + 3:boolean <- match-at 1:address:array:character, 1:address:array:character, 0:literal + ] + memory-should-contain [ + 3 <- 1 # matches because pattern is also empty + ] +] + +scenario match-at-inside-bounds [ + run [ + 1:address:array:character <- new [abc] + 2:address:array:character <- new [bc] + 3:boolean <- match-at 1:address:array:character, 2:address:array:character, 1:literal + ] + memory-should-contain [ + 3 <- 1 # matches inner substring + ] +] + +scenario match-at-inside-bounds-2 [ + run [ + 1:address:array:character <- new [abc] + 2:address:array:character <- new [bc] + 3:boolean <- match-at 1:address:array:character, 2:address:array:character, 0:literal + ] + memory-should-contain [ + 3 <- 0 # no match + ] +] + +# result:address:array:address:array:character <- split s:address:array:character, delim:character +recipe split [ + default-space:address:array:location <- new location:type, 30:literal + s:address:array:character <- next-ingredient + delim:character <- next-ingredient + # empty string? return empty array + len:number <- length s:address:array:character/deref + { + empty?:boolean <- equal len:number, 0:literal + break-unless empty?:boolean + result:address:array:address:array:character <- new location:type, 0:literal + reply result:address:array:address:array:character + } + # count #pieces we need room for + count:number <- copy 1:literal # n delimiters = n+1 pieces + idx:number <- copy 0:literal + { + idx:number <- find-next s:address:array:character, delim:character, idx:number + done?:boolean <- greater-or-equal idx:number, len:number + break-if done?:boolean + idx:number <- add idx:number, 1:literal + count:number <- add count:number, 1:literal + loop + } + # allocate space + result:address:array:address:array:character <- new location:type, count:number + # repeatedly copy slices start..end until delimiter into result[curr-result] + curr-result:number <- copy 0:literal + start:number <- copy 0:literal + { + # while next delim exists + done?:boolean <- greater-or-equal start:number, len:number + break-if done?:boolean + end:number <- find-next s:address:array:character, delim:character, start:number + # copy start..end into result[curr-result] + dest:address:address:array:character <- index-address result:address:array:address:array:character/deref, curr-result:number + dest:address:address:array:character/deref <- string-copy s:address:array:character, start:number, end:number + # slide over to next slice + start:number <- add end:number, 1:literal + curr-result:number <- add curr-result:number, 1:literal + loop + } + reply result:address:array:address:array:character +] + +scenario string-split-1 [ + run [ + 1:address:array:character <- new [a/b] + 2:address:array:address:array:character <- split 1:address:array:character, 47:literal/slash + 3:number <- length 2:address:array:address:array:character/deref + 4:address:array:character <- index 2:address:array:address:array:character/deref, 0:literal + 5:address:array:character <- index 2:address:array:address:array:character/deref, 1:literal + 10:array:character <- copy 4:address:array:character/deref + 20:array:character <- copy 5:address:array:character/deref + ] + memory-should-contain [ + 3 <- 2 # length of result + 10:string <- [a] + 20:string <- [b] + ] +] + +scenario string-split-2 [ + run [ + 1:address:array:character <- new [a/b/c] + 2:address:array:address:array:character <- split 1:address:array:character, 47:literal/slash + 3:number <- length 2:address:array:address:array:character/deref + 4:address:array:character <- index 2:address:array:address:array:character/deref, 0:literal + 5:address:array:character <- index 2:address:array:address:array:character/deref, 1:literal + 6:address:array:character <- index 2:address:array:address:array:character/deref, 2:literal + 10:array:character <- copy 4:address:array:character/deref + 20:array:character <- copy 5:address:array:character/deref + 30:array:character <- copy 6:address:array:character/deref + ] + memory-should-contain [ + 3 <- 3 # length of result + 10:string <- [a] + 20:string <- [b] + 30:string <- [c] + ] +] + +scenario string-split-missing [ + run [ + 1:address:array:character <- new [abc] + 2:address:array:address:array:character <- split 1:address:array:character, 47:literal/slash + 3:number <- length 2:address:array:address:array:character/deref + 4:address:array:character <- index 2:address:array:address:array:character/deref, 0:literal + 10:array:character <- copy 4:address:array:character/deref + ] + memory-should-contain [ + 3 <- 1 # length of result + 10:string <- [abc] + ] +] + +scenario string-split-empty [ + run [ + 1:address:array:character <- new [] + 2:address:array:address:array:character <- split 1:address:array:character, 47:literal/slash + 3:number <- length 2:address:array:address:array:character/deref + ] + memory-should-contain [ + 3 <- 0 # empty result + ] +] + +scenario string-split-empty-piece [ + run [ + 1:address:array:character <- new [a/b//c] + 2:address:array:address:array:character <- split 1:address:array:character, 47:literal/slash + 3:number <- length 2:address:array:address:array:character/deref + 4:address:array:character <- index 2:address:array:address:array:character/deref, 0:literal + 5:address:array:character <- index 2:address:array:address:array:character/deref, 1:literal + 6:address:array:character <- index 2:address:array:address:array:character/deref, 2:literal + 7:address:array:character <- index 2:address:array:address:array:character/deref, 3:literal + 10:array:character <- copy 4:address:array:character/deref + 20:array:character <- copy 5:address:array:character/deref + 30:array:character <- copy 6:address:array:character/deref + 40:array:character <- copy 7:address:array:character/deref + ] + memory-should-contain [ + 3 <- 4 # length of result + 10:string <- [a] + 20:string <- [b] + 30:string <- [] + 40:string <- [c] + ] +] + +# x:address:array:character, y:address:array:character <- split-first text:address:array:character, delim:character +recipe split-first [ + default-space:address:array:location <- new location:type, 30:literal + text:address:array:character <- next-ingredient + delim:character <- next-ingredient + # empty string? return empty strings + len:number <- length text:address:array:character/deref + { + empty?:boolean <- equal len:number, 0:literal + break-unless empty?:boolean + x:address:array:character <- new [] + y:address:array:character <- new [] + reply x:address:array:character, y:address:array:character + } + idx:number <- find-next text:address:array:character, delim:character, 0:literal + x:address:array:character <- string-copy text:address:array:character, 0:literal, idx:number + idx:number <- add idx:number, 1:literal + y:address:array:character <- string-copy text:address:array:character, idx:number, len:number + reply x:address:array:character, y:address:array:character +] + +scenario string-split-first [ + run [ + 1:address:array:character <- new [a/b] + 2:address:array:character, 3:address:array:character <- split-first 1:address:array:character, 47:literal/slash + 10:array:character <- copy 2:address:array:character/deref + 20:array:character <- copy 3:address:array:character/deref + ] + memory-should-contain [ + 10:string <- [a] + 20:string <- [b] + ] +] + +# result:address:array:character <- string-copy buf:address:array:character, start:number, end:number +# todo: make this generic +recipe string-copy [ + default-space:address:array:location <- new location:type, 30:literal + buf:address:array:character <- next-ingredient + start:number <- next-ingredient + end:number <- next-ingredient + # if end is out of bounds, trim it + len:number <- length buf:address:array:character/deref + end:number <- min len:number, end:number + # allocate space for result + len:number <- subtract end:number, start:number + result:address:array:character <- new character:type, len:number + # copy start..end into result[curr-result] + src-idx:number <- copy start:number + dest-idx:number <- copy 0:literal + { + done?:boolean <- greater-or-equal src-idx:number, end:number + break-if done?:boolean + src:character <- index buf:address:array:character/deref, src-idx:number + dest:address:character <- index-address result:address:array:character/deref, dest-idx:number + dest:address:character/deref <- copy src:character + src-idx:number <- add src-idx:number, 1:literal + dest-idx:number <- add dest-idx:number, 1:literal + loop + } + reply result:address:array:character +] + +scenario string-copy-copies-substring [ + run [ + 1:address:array:character <- new [abc] + 2:address:array:character <- string-copy 1:address:array:character, 1:literal, 3:literal + 3:array:character <- copy 2:address:array:character/deref + ] + memory-should-contain [ + 3:string <- [bc] + ] +] + +scenario string-copy-out-of-bounds [ + run [ + 1:address:array:character <- new [abc] + 2:address:array:character <- string-copy 1:address:array:character, 2:literal, 4:literal + 3:array:character <- copy 2:address:array:character/deref + ] + memory-should-contain [ + 3:string <- [c] + ] +] + +scenario string-copy-out-of-bounds-2 [ + run [ + 1:address:array:character <- new [abc] + 2:address:array:character <- string-copy 1:address:array:character, 3:literal, 3:literal + 3:array:character <- copy 2:address:array:character/deref + ] + memory-should-contain [ + 3:string <- [] + ] +] + +recipe min [ + default-space:address:array:location <- new location:type, 30:literal + x:number <- next-ingredient + y:number <- next-ingredient + { + return-x?:boolean <- lesser-than x:number, y:number + break-if return-x?:boolean + reply y:number + } + reply x:number +] + +recipe max [ + default-space:address:array:location <- new location:type, 30:literal + x:number <- next-ingredient + y:number <- next-ingredient + { + return-x?:boolean <- greater-than x:number, y:number + break-if return-x?:boolean + reply y:number + } + reply x:number +] diff --git a/html/061channel.mu.html b/html/061channel.mu.html index 4122d241..42ffdada 100644 --- a/html/061channel.mu.html +++ b/html/061channel.mu.html @@ -12,15 +12,15 @@ @@ -45,7 +45,7 @@ body { font-family: monospace; color: #eeeeee; background-color: #080808; } scenario channel [ run [ - 1:address:channel <- init-channel 3:literal/capacity + 1:address:channel <- new-channel 3:literal/capacity 1:address:channel <- write 1:address:channel, 34:literal 2:number, 1:address:channel <- read 1:address:channel ] @@ -66,8 +66,8 @@ container channel [ data:address:array:location ] -# result:address:channel <- init-channel capacity:number -recipe init-channel [ +# result:address:channel <- new-channel capacity:number +recipe new-channel [ default-space:address:array:location <- new location:type, 30:literal # result = new channel result:address:channel <- new channel:type @@ -154,7 +154,7 @@ container channel [ scenario channel-initialization [ run [ - 1:address:channel <- init-channel 3:literal/capacity + 1:address:channel <- new-channel 3:literal/capacity 2:number <- get 1:address:channel/deref, first-full:offset 3:number <- get 1:address:channel/deref, first-free:offset ] @@ -166,7 +166,7 @@ container channel [ scenario channel-write-increments-free [ run [ - 1:address:channel <- init-channel 3:literal/capacity + 1:address:channel <- new-channel 3:literal/capacity 1:address:channel <- write 1:address:channel, 34:literal 2:number <- get 1:address:channel/deref, first-full:offset 3:number <- get 1:address:channel/deref, first-free:offset @@ -179,7 +179,7 @@ container channel [ scenario channel-read-increments-full [ run [ - 1:address:channel <- init-channel 3:literal/capacity + 1:address:channel <- new-channel 3:literal/capacity 1:address:channel <- write 1:address:channel, 34:literal _, 1:address:channel <- read 1:address:channel 2:number <- get 1:address:channel/deref, first-full:offset @@ -194,7 +194,7 @@ container channel [ scenario channel-wrap [ run [ # channel with just 1 slot - 1:address:channel <- init-channel 1:literal/capacity + 1:address:channel <- new-channel 1:literal/capacity # write and read a value 1:address:channel <- write 1:address:channel, 34:literal _, 1:address:channel <- read 1:address:channel @@ -261,7 +261,7 @@ container channel [ scenario channel-new-empty-not-full [ run [ - 1:address:channel <- init-channel 3:literal/capacity + 1:address:channel <- new-channel 3:literal/capacity 2:boolean <- channel-empty? 1:address:channel 3:boolean <- channel-full? 1:address:channel ] @@ -273,7 +273,7 @@ container channel [ scenario channel-write-not-empty [ run [ - 1:address:channel <- init-channel 3:literal/capacity + 1:address:channel <- new-channel 3:literal/capacity 1:address:channel <- write 1:address:channel, 34:literal 2:boolean <- channel-empty? 1:address:channel 3:boolean <- channel-full? 1:address:channel @@ -286,7 +286,7 @@ container channel [ scenario channel-write-full [ run [ - 1:address:channel <- init-channel 1:literal/capacity + 1:address:channel <- new-channel 1:literal/capacity 1:address:channel <- write 1:address:channel, 34:literal 2:boolean <- channel-empty? 1:address:channel 3:boolean <- channel-full? 1:address:channel @@ -299,7 +299,7 @@ container channel [ scenario channel-read-not-full [ run [ - 1:address:channel <- init-channel 1:literal/capacity + 1:address:channel <- new-channel 1:literal/capacity 1:address:channel <- write 1:address:channel, 34:literal _, 1:address:channel <- read 1:address:channel 2:boolean <- channel-empty? 1:address:channel @@ -321,7 +321,7 @@ container channel [ out:address:channel <- next-ingredient # repeat forever { - line:address:buffer <- init-buffer, 30:literal + line:address:buffer <- new-buffer, 30:literal # read characters from 'in' until newline, copy into line { +next-character @@ -332,7 +332,7 @@ container channel [ backspace?:boolean <- equal c:character, 8:literal break-unless backspace?:boolean # drop previous character -#? return-to-console #? 2 +#? close-console #? 2 #? $print [backspace! #? 1 #? ] #? 1 { @@ -355,12 +355,12 @@ container channel [ line:address:buffer <- buffer-append line:address:buffer, c:character line-done?:boolean <- equal c:character, 10:literal/newline break-if line-done?:boolean - # stop buffering on eof (currently only generated by fake keyboard) - empty-fake-keyboard?:boolean <- equal c:character, 0:literal/eof - break-if empty-fake-keyboard?:boolean + # stop buffering on eof (currently only generated by fake console) + eof?:boolean <- equal c:character, 0:literal/eof + break-if eof?:boolean loop } -#? return-to-console #? 1 +#? close-console #? 1 # copy line into 'out' #? $print [buffer-lines: emitting #? ] @@ -386,8 +386,8 @@ container channel [ scenario buffer-lines-blocks-until-newline [ run [ - 1:address:channel/stdin <- init-channel 10:literal/capacity - 2:address:channel/buffered-stdin <- init-channel 10:literal/capacity + 1:address:channel/stdin <- new-channel 10:literal/capacity + 2:address:channel/buffered-stdin <- new-channel 10:literal/capacity 3:boolean <- channel-empty? 2:address:channel/buffered-stdin assert 3:boolean, [ F buffer-lines-blocks-until-newline: channel should be empty after init] diff --git a/html/062array.mu.html b/html/062array.mu.html index e7b4cb3a..299748d7 100644 --- a/html/062array.mu.html +++ b/html/062array.mu.html @@ -12,13 +12,13 @@ @@ -33,7 +33,7 @@ body { font-family: monospace; color: #eeeeee; background-color: #080808; } 
 scenario array-from-args [
   run [
-    1:address:array:location <- init-array 0:literal, 1:literal, 2:literal
+    1:address:array:location <- new-array 0:literal, 1:literal, 2:literal
     2:array:location <- copy 1:address:array:location/deref
   ]
   memory-should-contain [
@@ -45,7 +45,7 @@ body { font-family: monospace; color: #eeeeee; background-color: #080808; }
 ]
 
 # create an array out of a list of scalar args
-recipe init-array [
+recipe new-array [
   default-space:address:array:location <- new location:type, 30:literal
   capacity:number <- copy 0:literal
   {
@@ -63,7 +63,7 @@ body { font-family: monospace; color: #eeeeee; background-color: #080808; }
     done?:boolean <- greater-or-equal i:number, capacity:number
     break-if done?:boolean
     curr-value:location, exists?:boolean <- next-ingredient
-    assert exists?:boolean, [error in rewinding ingredients to init-array]
+    assert exists?:boolean, [error in rewinding ingredients to new-array]
     tmp:address:location <- index-address result:address:array:location/deref, i:number
     tmp:address:location/deref <- copy curr-value:location
     i:number <- add i:number, 1:literal
diff --git a/html/063list.mu.html b/html/063list.mu.html
index cd1a7b40..fa128a0b 100644
--- a/html/063list.mu.html
+++ b/html/063list.mu.html
@@ -12,13 +12,13 @@
 
 
diff --git a/html/064random.cc.html b/html/064random.cc.html
index 27c847a2..f783de38 100644
--- a/html/064random.cc.html
+++ b/html/064random.cc.html
@@ -12,12 +12,12 @@
 
diff --git a/html/065duplex_list.mu.html b/html/065duplex_list.mu.html
new file mode 100644
index 00000000..6f81c5fa
--- /dev/null
+++ b/html/065duplex_list.mu.html
@@ -0,0 +1,407 @@
+
+
+
+
+Mu - 065duplex_list.mu
+
+
+
+
+
+
+
+
+
+
+
+# A doubly linked list permits bidirectional traversal.
+
+container duplex-list [
+  value:location
+  next:address:duplex-list
+  prev:address:duplex-list
+]
+
+# result:address:duplex-list <- push-duplex x:location, in:address:duplex-list
+recipe push-duplex [
+  default-space:address:array:location <- new location:type, 30:literal
+  x:location <- next-ingredient
+  in:address:duplex-list <- next-ingredient
+  result:address:duplex-list <- new duplex-list:type
+  val:address:location <- get-address result:address:duplex-list/deref, value:offset
+  val:address:location/deref <- copy x:location
+  next:address:address:duplex-list <- get-address result:address:duplex-list/deref, next:offset
+  next:address:address:duplex-list/deref <- copy in:address:duplex-list
+  reply-unless in:address:duplex-list, result:address:duplex-list
+  prev:address:address:duplex-list <- get-address in:address:duplex-list/deref, prev:offset
+  prev:address:address:duplex-list/deref <- copy result:address:duplex-list
+  reply result:address:duplex-list
+]
+
+# result:location <- first-duplex in:address:duplex-list
+recipe first-duplex [
+  default-space:address:array:location <- new location:type, 30:literal
+  in:address:duplex-list <- next-ingredient
+  reply-unless in:address:duplex-list, 0:literal
+  result:location <- get in:address:duplex-list/deref, value:offset
+  reply result:location
+]
+
+# result:address:duplex-list <- next-duplex in:address:duplex-list
+recipe next-duplex [
+  default-space:address:array:location <- new location:type, 30:literal
+  in:address:duplex-list <- next-ingredient
+  reply-unless in:address:duplex-list, 0:literal
+  result:address:duplex-list <- get in:address:duplex-list/deref, next:offset
+  reply result:address:duplex-list
+]
+
+# result:address:duplex-list <- prev-duplex in:address:duplex-list
+recipe prev-duplex [
+  default-space:address:array:location <- new location:type, 30:literal
+  in:address:duplex-list <- next-ingredient
+  reply-unless in:address:duplex-list, 0:literal
+  result:address:duplex-list <- get in:address:duplex-list/deref, prev:offset
+  reply result:address:duplex-list
+]
+
+scenario duplex-list-handling [
+  run [
+    # reserve locations 0, 1 and 2 to check for missing null check
+    1:number <- copy 34:literal
+    2:number <- copy 35:literal
+    3:address:duplex-list <- copy 0:literal
+    3:address:duplex-list <- push-duplex 3:literal, 3:address:duplex-list
+    3:address:duplex-list <- push-duplex 4:literal, 3:address:duplex-list
+    3:address:duplex-list <- push-duplex 5:literal, 3:address:duplex-list
+    4:address:duplex-list <- copy 3:address:duplex-list
+    5:number <- first 4:address:duplex-list
+    4:address:duplex-list <- next-duplex 4:address:duplex-list
+    6:number <- first 4:address:duplex-list
+    4:address:duplex-list <- next-duplex 4:address:duplex-list
+    7:number <- first 4:address:duplex-list
+    8:address:duplex-list <- next-duplex 4:address:duplex-list
+    9:number <- first 8:address:duplex-list
+    10:address:duplex-list <- next-duplex 8:address:duplex-list
+    11:address:duplex-list <- prev-duplex 8:address:duplex-list
+    4:address:duplex-list <- prev-duplex 4:address:duplex-list
+    12:number <- first 4:address:duplex-list
+    4:address:duplex-list <- prev-duplex 4:address:duplex-list
+    13:number <- first 4:address:duplex-list
+    14:boolean <- equal 3:address:duplex-list, 4:address:duplex-list
+#?     $dump-trace #? 1
+  ]
+  memory-should-contain [
+    0 <- 0  # no modifications to null pointers
+    1 <- 34
+    2 <- 35
+    5 <- 5  # scanning next
+    6 <- 4
+    7 <- 3
+    8 <- 0  # null
+    9 <- 0  # first of null
+    10 <- 0  # next of null
+    11 <- 0  # prev of null
+    12 <- 4  # then start scanning prev
+    13 <- 5
+    14 <- 1  # list back at start
+  ]
+]
+
+# l:address:duplex-list <- insert-duplex x:location, in:address:duplex-list
+# Inserts 'x' after 'in'. Returns some pointer into the list.
+recipe insert-duplex [
+  default-space:address:array:location <- new location:type, 30:literal
+  x:location <- next-ingredient
+  in:address:duplex-list <- next-ingredient
+  new-node:address:duplex-list <- new duplex-list:type
+  val:address:location <- get-address new-node:address:duplex-list/deref, value:offset
+  val:address:location/deref <- copy x:location
+  next-node:address:duplex-list <- get in:address:duplex-list/deref, next:offset
+  # in.next = new-node
+  y:address:address:duplex-list <- get-address in:address:duplex-list/deref, next:offset
+  y:address:address:duplex-list/deref <- copy new-node:address:duplex-list
+  # new-node.prev = in
+  y:address:address:duplex-list <- get-address new-node:address:duplex-list/deref, prev:offset
+  y:address:address:duplex-list/deref <- copy in:address:duplex-list
+  # new-node.next = next-node
+  y:address:address:duplex-list <- get-address new-node:address:duplex-list/deref, next:offset
+  y:address:address:duplex-list/deref <- copy next-node:address:duplex-list
+  # if next-node is not null
+  reply-unless next-node:address:duplex-list, new-node:address:duplex-list
+  # next-node.prev = new-node
+  y:address:address:duplex-list <- get-address next-node:address:duplex-list/deref, prev:offset
+  y:address:address:duplex-list/deref <- copy new-node:address:duplex-list
+  reply new-node:address:duplex-list  # just signalling something changed; don't rely on the result
+]
+
+scenario inserting-into-duplex-list [
+  run [
+    1:address:duplex-list <- copy 0:literal  # 1 points to head of list
+    1:address:duplex-list <- push-duplex 3:literal, 1:address:duplex-list
+    1:address:duplex-list <- push-duplex 4:literal, 1:address:duplex-list
+    1:address:duplex-list <- push-duplex 5:literal, 1:address:duplex-list
+    2:address:duplex-list <- next-duplex 1:address:duplex-list  # 2 points inside list
+    2:address:duplex-list <- insert-duplex 6:literal, 2:address:duplex-list
+    # check structure like before
+    2:address:duplex-list <- copy 1:address:duplex-list
+    3:number <- first 2:address:duplex-list
+    2:address:duplex-list <- next-duplex 2:address:duplex-list
+    4:number <- first 2:address:duplex-list
+    2:address:duplex-list <- next-duplex 2:address:duplex-list
+    5:number <- first 2:address:duplex-list
+    2:address:duplex-list <- next-duplex 2:address:duplex-list
+    6:number <- first 2:address:duplex-list
+    2:address:duplex-list <- prev-duplex 2:address:duplex-list
+    7:number <- first 2:address:duplex-list
+    2:address:duplex-list <- prev-duplex 2:address:duplex-list
+    8:number <- first 2:address:duplex-list
+    2:address:duplex-list <- prev-duplex 2:address:duplex-list
+    9:number <- first 2:address:duplex-list
+    10:boolean <- equal 1:address:duplex-list, 2:address:duplex-list
+  ]
+  memory-should-contain [
+    3 <- 5  # scanning next
+    4 <- 4
+    5 <- 6  # inserted element
+    6 <- 3
+    7 <- 6  # then prev
+    8 <- 4
+    9 <- 5
+    10 <- 1  # list back at start
+  ]
+]
+
+scenario inserting-at-end-of-duplex-list [
+  run [
+    1:address:duplex-list <- copy 0:literal  # 1 points to head of list
+    1:address:duplex-list <- push-duplex 3:literal, 1:address:duplex-list
+    1:address:duplex-list <- push-duplex 4:literal, 1:address:duplex-list
+    1:address:duplex-list <- push-duplex 5:literal, 1:address:duplex-list
+    2:address:duplex-list <- next-duplex 1:address:duplex-list  # 2 points inside list
+    2:address:duplex-list <- next-duplex 2:address:duplex-list  # now at end of list
+    2:address:duplex-list <- insert-duplex 6:literal, 2:address:duplex-list
+    # check structure like before
+    2:address:duplex-list <- copy 1:address:duplex-list
+    3:number <- first 2:address:duplex-list
+    2:address:duplex-list <- next-duplex 2:address:duplex-list
+    4:number <- first 2:address:duplex-list
+    2:address:duplex-list <- next-duplex 2:address:duplex-list
+    5:number <- first 2:address:duplex-list
+    2:address:duplex-list <- next-duplex 2:address:duplex-list
+    6:number <- first 2:address:duplex-list
+    2:address:duplex-list <- prev-duplex 2:address:duplex-list
+    7:number <- first 2:address:duplex-list
+    2:address:duplex-list <- prev-duplex 2:address:duplex-list
+    8:number <- first 2:address:duplex-list
+    2:address:duplex-list <- prev-duplex 2:address:duplex-list
+    9:number <- first 2:address:duplex-list
+    10:boolean <- equal 1:address:duplex-list, 2:address:duplex-list
+  ]
+  memory-should-contain [
+    3 <- 5  # scanning next
+    4 <- 4
+    5 <- 3
+    6 <- 6  # inserted element
+    7 <- 3  # then prev
+    8 <- 4
+    9 <- 5
+    10 <- 1  # list back at start
+  ]
+]
+
+scenario inserting-after-start-of-duplex-list [
+  run [
+    1:address:duplex-list <- copy 0:literal  # 1 points to head of list
+    1:address:duplex-list <- push-duplex 3:literal, 1:address:duplex-list
+    1:address:duplex-list <- push-duplex 4:literal, 1:address:duplex-list
+    1:address:duplex-list <- push-duplex 5:literal, 1:address:duplex-list
+    2:address:duplex-list <- insert-duplex 6:literal, 1:address:duplex-list
+    # check structure like before
+    2:address:duplex-list <- copy 1:address:duplex-list
+    3:number <- first 2:address:duplex-list
+    2:address:duplex-list <- next-duplex 2:address:duplex-list
+    4:number <- first 2:address:duplex-list
+    2:address:duplex-list <- next-duplex 2:address:duplex-list
+    5:number <- first 2:address:duplex-list
+    2:address:duplex-list <- next-duplex 2:address:duplex-list
+    6:number <- first 2:address:duplex-list
+    2:address:duplex-list <- prev-duplex 2:address:duplex-list
+    7:number <- first 2:address:duplex-list
+    2:address:duplex-list <- prev-duplex 2:address:duplex-list
+    8:number <- first 2:address:duplex-list
+    2:address:duplex-list <- prev-duplex 2:address:duplex-list
+    9:number <- first 2:address:duplex-list
+    10:boolean <- equal 1:address:duplex-list, 2:address:duplex-list
+  ]
+  memory-should-contain [
+    3 <- 5  # scanning next
+    4 <- 6  # inserted element
+    5 <- 4
+    6 <- 3
+    7 <- 4  # then prev
+    8 <- 6
+    9 <- 5
+    10 <- 1  # list back at start
+  ]
+]
+
+# l:address:duplex-list <- remove-duplex in:address:duplex-list
+# Removes 'in' from its surrounding list. Returns some valid pointer into the
+# rest of the list.
+#
+# Returns null if and only if list is empty. Beware: in that case any pointers
+# to the head are now invalid.
+recipe remove-duplex [
+  default-space:address:array:location <- new location:type, 30:literal
+  in:address:duplex-list <- next-ingredient
+  # if 'in' is null, return
+  reply-unless in:address:duplex-list, in:address:duplex-list
+  next-node:address:duplex-list <- get in:address:duplex-list/deref, next:offset
+  prev-node:address:duplex-list <- get in:address:duplex-list/deref, prev:offset
+  # null in's pointers
+  x:address:address:duplex-list <- get-address in:address:duplex-list/deref, next:offset
+  x:address:address:duplex-list/deref <- copy 0:literal
+  x:address:address:duplex-list <- get-address in:address:duplex-list/deref, prev:offset
+  x:address:address:duplex-list/deref <- copy 0:literal
+  {
+    # if next-node is not null
+    break-unless next-node:address:duplex-list
+    # next-node.prev = prev-node
+    x:address:address:duplex-list <- get-address next-node:address:duplex-list/deref, prev:offset
+    x:address:address:duplex-list/deref <- copy prev-node:address:duplex-list
+  }
+  {
+    # if prev-node is not null
+    break-unless prev-node:address:duplex-list
+    # prev-node.next = next-node
+    x:address:address:duplex-list <- get-address prev-node:address:duplex-list/deref, next:offset
+    x:address:address:duplex-list/deref <- copy next-node:address:duplex-list
+    reply prev-node:address:duplex-list
+  }
+  reply next-node:address:duplex-list
+]
+
+scenario removing-from-duplex-list [
+  run [
+    1:address:duplex-list <- copy 0:literal  # 1 points to head of list
+    1:address:duplex-list <- push-duplex 3:literal, 1:address:duplex-list
+    1:address:duplex-list <- push-duplex 4:literal, 1:address:duplex-list
+    1:address:duplex-list <- push-duplex 5:literal, 1:address:duplex-list
+    2:address:duplex-list <- next-duplex 1:address:duplex-list  # 2 points at second element
+    2:address:duplex-list <- remove-duplex 2:address:duplex-list
+    3:boolean <- equal 2:address:duplex-list, 0:literal
+    # check structure like before
+    2:address:duplex-list <- copy 1:address:duplex-list
+    4:number <- first 2:address:duplex-list
+    2:address:duplex-list <- next-duplex 2:address:duplex-list
+    5:number <- first 2:address:duplex-list
+    6:address:duplex-list <- next-duplex 2:address:duplex-list
+    2:address:duplex-list <- prev-duplex 2:address:duplex-list
+    7:number <- first 2:address:duplex-list
+    8:boolean <- equal 1:address:duplex-list, 2:address:duplex-list
+  ]
+  memory-should-contain [
+    3 <- 0  # remove returned non-null
+    4 <- 5  # scanning next, skipping deleted element
+    5 <- 3
+    6 <- 0  # no more elements
+    7 <- 5  # prev of final element
+    8 <- 1  # list back at start
+  ]
+]
+
+scenario removing-from-start-of-duplex-list [
+  run [
+    1:address:duplex-list <- copy 0:literal  # 1 points to head of list
+    1:address:duplex-list <- push-duplex 3:literal, 1:address:duplex-list
+    1:address:duplex-list <- push-duplex 4:literal, 1:address:duplex-list
+    1:address:duplex-list <- push-duplex 5:literal, 1:address:duplex-list
+    # removing from head? return value matters.
+    1:address:duplex-list <- remove-duplex 1:address:duplex-list
+    # check structure like before
+    2:address:duplex-list <- copy 1:address:duplex-list
+    3:number <- first 2:address:duplex-list
+    2:address:duplex-list <- next-duplex 2:address:duplex-list
+    4:number <- first 2:address:duplex-list
+    5:address:duplex-list <- next-duplex 2:address:duplex-list
+    2:address:duplex-list <- prev-duplex 2:address:duplex-list
+    6:number <- first 2:address:duplex-list
+    7:boolean <- equal 1:address:duplex-list, 2:address:duplex-list
+  ]
+  memory-should-contain [
+    3 <- 4  # scanning next, skipping deleted element
+    4 <- 3
+    5 <- 0  # no more elements
+    6 <- 4  # prev of final element
+    7 <- 1  # list back at start
+  ]
+]
+
+scenario removing-from-end-of-duplex-list [
+  run [
+    1:address:duplex-list <- copy 0:literal  # 1 points to head of list
+    1:address:duplex-list <- push-duplex 3:literal, 1:address:duplex-list
+    1:address:duplex-list <- push-duplex 4:literal, 1:address:duplex-list
+    1:address:duplex-list <- push-duplex 5:literal, 1:address:duplex-list
+    # delete last element
+    2:address:duplex-list <- next-duplex 1:address:duplex-list
+    2:address:duplex-list <- next-duplex 2:address:duplex-list
+    2:address:duplex-list <- remove-duplex 2:address:duplex-list
+    3:boolean <- equal 2:address:duplex-list, 0:literal
+    # check structure like before
+    2:address:duplex-list <- copy 1:address:duplex-list
+    4:number <- first 2:address:duplex-list
+    2:address:duplex-list <- next-duplex 2:address:duplex-list
+    5:number <- first 2:address:duplex-list
+    6:address:duplex-list <- next-duplex 2:address:duplex-list
+    2:address:duplex-list <- prev-duplex 2:address:duplex-list
+    7:number <- first 2:address:duplex-list
+    8:boolean <- equal 1:address:duplex-list, 2:address:duplex-list
+  ]
+  memory-should-contain [
+    3 <- 0  # remove returned non-null
+    4 <- 5  # scanning next, skipping deleted element
+    5 <- 4
+    6 <- 0  # no more elements
+    7 <- 5  # prev of final element
+    8 <- 1  # list back at start
+  ]
+]
+
+scenario removing-from-singleton-list [
+  run [
+    1:address:duplex-list <- copy 0:literal  # 1 points to singleton list
+    1:address:duplex-list <- push-duplex 3:literal, 1:address:duplex-list
+    2:address:duplex-list <- remove-duplex 1:address:duplex-list
+    3:address:duplex-list <- get 1:address:duplex-list/deref, next:offset
+    4:address:duplex-list <- get 1:address:duplex-list/deref, prev:offset
+  ]
+  memory-should-contain [
+    2 <- 0  # remove returned null
+    3 <- 0  # removed node is also detached
+    4 <- 0
+  ]
+]
+

+
+
+
diff --git a/html/066stream.mu.html b/html/066stream.mu.html
new file mode 100644
index 00000000..feba9cf7
--- /dev/null
+++ b/html/066stream.mu.html
@@ -0,0 +1,79 @@
+
+
+
+
+Mu - 066stream.mu
+
+
+
+
+
+
+
+
+
+
+
+# new type to help incrementally read strings
+container stream [
+  index:number
+  data:address:array:character
+]
+
+recipe new-stream [
+  default-space:address:array:location <- new location:type, 30:literal
+  result:address:stream <- new stream:type
+  i:address:number <- get-address result:address:stream/deref, index:offset
+  i:address:number/deref <- copy 0:literal
+  d:address:address:array:character <- get-address result:address:stream/deref, data:offset
+  d:address:address:array:character/deref <- next-ingredient
+  reply result:address:stream
+]
+
+recipe rewind-stream [
+  default-space:address:array:location <- new location:type, 30:literal
+  in:address:stream <- next-ingredient
+  x:address:number <- get-address in:address:stream/deref, index:offset
+  x:address:number/deref <- copy 0:literal
+  reply in:address:stream/same-as-arg:0
+]
+
+recipe read-line [
+  default-space:address:array:location <- new location:type, 30:literal
+  in:address:stream <- next-ingredient
+  idx:address:number <- get-address in:address:stream/deref, index:offset
+  s:address:array:character <- get in:address:stream/deref, data:offset
+  next-idx:number <- find-next s:address:array:character, 10:literal/newline, idx:address:number/deref
+  result:address:array:character <- string-copy s:address:array:character, idx:address:number/deref, next-idx:number
+  idx:address:number/deref <- add next-idx:number, 1:literal  # skip newline
+  reply result:address:array:character
+]
+
+recipe end-of-stream? [
+  default-space:address:array:location <- new location:type, 30:literal
+  in:address:stream <- next-ingredient
+  idx:number <- get in:address:stream/deref, index:offset
+  s:address:array:character <- get in:address:stream/deref, data:offset
+  len:number <- length s:address:array:character/deref
+  result:boolean <- greater-or-equal idx:number, len:number
+  reply result:boolean
+]
+

+
+
+
diff --git a/html/070display.cc.html b/html/070display.cc.html
index 9b31520f..24b460f0 100644
--- a/html/070display.cc.html
+++ b/html/070display.cc.html
@@ -12,14 +12,13 @@
 
 
@@ -32,10 +31,10 @@ body { font-family: monospace; color: #eeeeee; background-color: #080808; }
 
 
 
-//: Take charge of the text-mode display and keyboard.
+//: Take charge of the text-mode display and console.
 
-// uncomment to debug console programs
 :(before "End Globals")
+// uncomment to debug console programs
 //? ofstream LOG("log.txt");
 
 //:: Display management
@@ -44,23 +43,23 @@ body { font-family: monospace; color: #eeeeee; background-color: #080808; }
 long long int Display_row = 0, Display_column = 0;
 
 :(before "End Primitive Recipe Declarations")
-SWITCH_TO_DISPLAY,
+OPEN_CONSOLE,
 :(before "End Primitive Recipe Numbers")
-Recipe_number["switch-to-display"] = SWITCH_TO_DISPLAY;
-//? cerr << "switch-to-display: " << SWITCH_TO_DISPLAY << '\n'; //? 1
+Recipe_number["open-console"] = OPEN_CONSOLE;
+//? cerr << "open-console: " << OPEN_CONSOLE << '\n'; //? 1
 :(before "End Primitive Recipe Implementations")
-case SWITCH_TO_DISPLAY: {
+case OPEN_CONSOLE: {
   tb_init();
   Display_row = Display_column = 0;
   break;
 }
 
 :(before "End Primitive Recipe Declarations")
-RETURN_TO_CONSOLE,
+CLOSE_CONSOLE,
 :(before "End Primitive Recipe Numbers")
-Recipe_number["return-to-console"] = RETURN_TO_CONSOLE;
+Recipe_number["close-console"] = CLOSE_CONSOLE;
 :(before "End Primitive Recipe Implementations")
-case RETURN_TO_CONSOLE: {
+case CLOSE_CONSOLE: {
   tb_shutdown();
 //?   Trace_stream->dump_layer = "all"; //? 1
   break;
@@ -253,53 +252,73 @@ case DISPLAY_HEIGHT: {
   break;
 }
 
-//:: Keyboard management
+//:: Keyboard/mouse management
 
 :(before "End Primitive Recipe Declarations")
-WAIT_FOR_KEY_FROM_KEYBOARD,
+WAIT_FOR_SOME_INTERACTION,
 :(before "End Primitive Recipe Numbers")
-Recipe_number["wait-for-key-from-keyboard"] = WAIT_FOR_KEY_FROM_KEYBOARD;
+Recipe_number["wait-for-some-interaction"] = WAIT_FOR_SOME_INTERACTION;
 :(before "End Primitive Recipe Implementations")
-case WAIT_FOR_KEY_FROM_KEYBOARD: {
+case WAIT_FOR_SOME_INTERACTION: {
   tb_event event;
-  do {
-    tb_poll_event(&event);
-  } while (event.type != TB_EVENT_KEY);
-  long long int result = event.key ? event.key : event.ch;
-  if (result == TB_KEY_CTRL_C) tb_shutdown(), exit(1);
-  if (result == TB_KEY_BACKSPACE2) result = TB_KEY_BACKSPACE;
-  if (result == TB_KEY_CARRIAGE_RETURN) result = TB_KEY_NEWLINE;
-  products.resize(1);
-  products.at(0).push_back(result);
+  tb_poll_event(&event);
   break;
 }
 
 :(before "End Primitive Recipe Declarations")
-READ_KEY_FROM_KEYBOARD,
+CHECK_FOR_INTERACTION,
 :(before "End Primitive Recipe Numbers")
-Recipe_number["read-key-from-keyboard"] = READ_KEY_FROM_KEYBOARD;
+Recipe_number["check-for-interaction"] = CHECK_FOR_INTERACTION;
 :(before "End Primitive Recipe Implementations")
-case READ_KEY_FROM_KEYBOARD: {
+case CHECK_FOR_INTERACTION: {
+  products.resize(2);  // result and status
   tb_event event;
   int event_type = tb_peek_event(&event, 5/*ms*/);
-  long long int result = 0;
-  long long int found = false;
-//?   cerr << event_type << '\n'; //? 1
+  if (event_type == TB_EVENT_KEY && event.ch) {
+    products.at(0).push_back(/*text event*/0);
+    products.at(0).push_back(event.ch);
+    products.at(0).push_back(0);
+    products.at(0).push_back(0);
+    products.at(1).push_back(/*found*/true);
+    break;
+  }
+  // treat keys within ascii as unicode characters
+  if (event_type == TB_EVENT_KEY && event.key < 0xff) {
+    products.at(0).push_back(/*text event*/0);
+    if (event.key == TB_KEY_CTRL_C) tb_shutdown(), exit(1);
+    if (event.key == TB_KEY_BACKSPACE2) event.key = TB_KEY_BACKSPACE;
+    if (event.key == TB_KEY_CARRIAGE_RETURN) event.key = TB_KEY_NEWLINE;
+    products.at(0).push_back(event.key);
+    products.at(0).push_back(0);
+    products.at(0).push_back(0);
+    products.at(1).push_back(/*found*/true);
+    break;
+  }
+  // keys outside ascii aren't unicode characters but arbitrary termbox inventions
   if (event_type == TB_EVENT_KEY) {
-    result = event.key ? event.key : event.ch;
-    if (result == TB_KEY_CTRL_C) tb_shutdown(), exit(1);
-    if (result == TB_KEY_BACKSPACE2) result = TB_KEY_BACKSPACE;
-    if (result == TB_KEY_CARRIAGE_RETURN) result = TB_KEY_NEWLINE;
-    found = true;
+    products.at(0).push_back(/*keycode event*/1);
+    products.at(0).push_back(event.key);
+    products.at(0).push_back(0);
+    products.at(0).push_back(0);
+    products.at(1).push_back(/*found*/true);
+    break;
   }
-  products.resize(2);
-  products.at(0).push_back(result);
-  products.at(1).push_back(found);
+  if (event_type == TB_EVENT_MOUSE) {
+    products.at(0).push_back(/*mouse event*/1);
+    products.at(0).push_back(event.key);  // which button, etc.
+    products.at(0).push_back(event.y);  // row
+    products.at(0).push_back(event.x);  // column
+    products.at(1).push_back(/*found*/true);
+    break;
+  }
+  // ignore TB_EVENT_RESIZE events for now
+  products.at(0).push_back(0);
+  products.at(0).push_back(0);
+  products.at(0).push_back(0);
+  products.at(0).push_back(0);
+  products.at(1).push_back(/*found*/false);
   break;
 }
-
-:(before "End Includes")
-#include"termbox/termbox.h"
 

 
 
diff --git a/html/071print.mu.html b/html/071print.mu.html
index 56ea1f74..b9a67840 100644
--- a/html/071print.mu.html
+++ b/html/071print.mu.html
@@ -12,14 +12,14 @@
 
 
@@ -48,7 +48,7 @@ container screen-cell [
   color:number
 ]
 
-recipe init-fake-screen [
+recipe new-fake-screen [
   default-space:address:array:location <- new location:type, 30:literal/capacity
   result:address:screen <- new screen:type
   width:address:number <- get-address result:address:screen/deref, num-columns:offset
@@ -119,7 +119,6 @@ container screen-cell [
     column:address:number <- get-address x:address:screen/deref, cursor-column:offset
     width:number <- get x:address:screen/deref, num-columns:offset
     height:number <- get x:address:screen/deref, num-rows:offset
-    max-row:number <- subtract height:number, 1:literal
     # special-case: newline
     {
       newline?:boolean <- equal c:character, 10:literal/newline
@@ -128,7 +127,8 @@ container screen-cell [
       break-unless newline?:boolean
       {
         # unless cursor is already at bottom
-        at-bottom?:boolean <- greater-or-equal row:address:number/deref, max-row:number
+        bottom:number <- subtract height:number, 1:literal
+        at-bottom?:boolean <- greater-or-equal row:address:number/deref, bottom:number
         break-if at-bottom?:boolean
         # move it to the next row
         column:address:number/deref <- copy 0:literal
@@ -137,6 +137,8 @@ container screen-cell [
       reply x:address:screen/same-as-ingredient:0
     }
     # save character in fake screen
+#?     $print row:address:number/deref, [, ], column:address:number/deref, [ 
+#? ] #? 1
     index:number <- multiply row:address:number/deref, width:number
     index:number <- add index:number, column:address:number/deref
     buf:address:array:screen-cell <- get x:address:screen/deref, data:offset
@@ -168,7 +170,8 @@ container screen-cell [
     cursor-color:address:number/deref <- copy color:number
     # increment column unless it's already all the way to the right
     {
-      at-right?:boolean <- equal column:address:number/deref, width:number
+      right:number <- subtract width:number, 1:literal
+      at-right?:boolean <- greater-or-equal column:address:number/deref, right:number
       break-if at-right?:boolean
       column:address:number/deref <- add column:address:number/deref, 1:literal
     }
@@ -182,7 +185,7 @@ container screen-cell [
 scenario print-character-at-top-left [
   run [
 #?     $start-tracing #? 3
-    1:address:screen <- init-fake-screen 3:literal/width, 2:literal/height
+    1:address:screen <- new-fake-screen 3:literal/width, 2:literal/height
     1:address:screen <- print-character 1:address:screen, 97:literal  # 'a'
     2:address:array:screen-cell <- get 1:address:screen/deref, data:offset
     3:array:screen-cell <- copy 2:address:array:screen-cell/deref
@@ -197,7 +200,7 @@ container screen-cell [
 
 scenario print-character-color [
   run [
-    1:address:screen <- init-fake-screen 3:literal/width, 2:literal/height
+    1:address:screen <- new-fake-screen 3:literal/width, 2:literal/height
     1:address:screen <- print-character 1:address:screen, 97:literal/a, 1:literal/red
     2:address:array:screen-cell <- get 1:address:screen/deref, data:offset
     3:array:screen-cell <- copy 2:address:array:screen-cell/deref
@@ -213,9 +216,28 @@ container screen-cell [
 scenario print-backspace-character [
   run [
 #?     $start-tracing #? 3
-    1:address:screen <- init-fake-screen 3:literal/width, 2:literal/height
+    1:address:screen <- new-fake-screen 3:literal/width, 2:literal/height
+    1:address:screen <- print-character 1:address:screen, 97:literal  # 'a'
+    1:address:screen <- print-character 1:address:screen, 8:literal  # backspace
+    2:number <- get 1:address:screen/deref, cursor-column:offset
+    3:address:array:screen-cell <- get 1:address:screen/deref, data:offset
+    4:array:screen-cell <- copy 3:address:array:screen-cell/deref
+  ]
+  memory-should-contain [
+    2 <- 0  # cursor column
+    4 <- 6  # width*height
+    5 <- 32  # space, not 'a'
+    6 <- 7  # white
+    7 <- 0
+  ]
+]
+
+scenario print-extra-backspace-character [
+  run [
+    1:address:screen <- new-fake-screen 3:literal/width, 2:literal/height
     1:address:screen <- print-character 1:address:screen, 97:literal  # 'a'
     1:address:screen <- print-character 1:address:screen, 8:literal  # backspace
+    1:address:screen <- print-character 1:address:screen, 8:literal  # backspace
     2:number <- get 1:address:screen/deref, cursor-column:offset
     3:address:array:screen-cell <- get 1:address:screen/deref, data:offset
     4:array:screen-cell <- copy 3:address:array:screen-cell/deref
@@ -229,10 +251,31 @@ container screen-cell [
   ]
 ]
 
+scenario print-at-right-margin [
+  run [
+    1:address:screen <- new-fake-screen 2:literal/width, 2:literal/height
+    1:address:screen <- print-character 1:address:screen, 97:literal  # 'a'
+    1:address:screen <- print-character 1:address:screen, 98:literal  # 'b'
+    1:address:screen <- print-character 1:address:screen, 99:literal  # 'c'
+    2:number <- get 1:address:screen/deref, cursor-column:offset
+    3:address:array:screen-cell <- get 1:address:screen/deref, data:offset
+    4:array:screen-cell <- copy 3:address:array:screen-cell/deref
+  ]
+  memory-should-contain [
+    2 <- 1  # cursor column
+    4 <- 4  # width*height
+    5 <- 97  # 'a'
+    6 <- 7  # white
+    7 <- 99  # 'c' over 'b'
+    8 <- 7  # white
+    9 <- 0
+  ]
+]
+
 scenario print-newline-character [
   run [
 #?     $start-tracing #? 3
-    1:address:screen <- init-fake-screen 3:literal/width, 2:literal/height
+    1:address:screen <- new-fake-screen 3:literal/width, 2:literal/height
     1:address:screen <- print-character 1:address:screen, 97:literal  # 'a'
     1:address:screen <- print-character 1:address:screen, 10:literal/newline
     2:number <- get 1:address:screen/deref, cursor-row:offset
@@ -250,13 +293,58 @@ container screen-cell [
   ]
 ]
 
+scenario print-newline-at-bottom-line [
+  run [
+    1:address:screen <- new-fake-screen 3:literal/width, 2:literal/height
+    1:address:screen <- print-character 1:address:screen, 10:literal/newline
+    1:address:screen <- print-character 1:address:screen, 10:literal/newline
+    1:address:screen <- print-character 1:address:screen, 10:literal/newline
+    2:number <- get 1:address:screen/deref, cursor-row:offset
+    3:number <- get 1:address:screen/deref, cursor-column:offset
+  ]
+  memory-should-contain [
+    2 <- 1  # cursor row
+    3 <- 0  # cursor column
+  ]
+]
+
+scenario print-at-bottom-right [
+  run [
+    1:address:screen <- new-fake-screen 2:literal/width, 2:literal/height
+    1:address:screen <- print-character 1:address:screen, 10:literal/newline
+    1:address:screen <- print-character 1:address:screen, 97:literal  # 'a'
+    1:address:screen <- print-character 1:address:screen, 98:literal  # 'b'
+    1:address:screen <- print-character 1:address:screen, 99:literal  # 'c'
+    1:address:screen <- print-character 1:address:screen, 10:literal/newline
+    1:address:screen <- print-character 1:address:screen, 100:literal  # 'd'
+    2:number <- get 1:address:screen/deref, cursor-row:offset
+    3:number <- get 1:address:screen/deref, cursor-column:offset
+    4:address:array:screen-cell <- get 1:address:screen/deref, data:offset
+    5:array:screen-cell <- copy 4:address:array:screen-cell/deref
+  ]
+  memory-should-contain [
+    2 <- 1  # cursor row
+    3 <- 1  # cursor column
+    5 <- 4  # width*height
+    6 <- 0  # unused
+    7 <- 7  # white
+    8 <- 0  # unused
+    9 <- 7  # white
+    10 <- 97 # 'a'
+    11 <- 7  # white
+    12 <- 100  # 'd' over 'b' and 'c' and newline
+    13 <- 7  # white
+    14 <- 0
+  ]
+]
+
 recipe clear-line [
   default-space:address:array:location <- new location:type, 30:literal
   x:address:screen <- next-ingredient
   # if x exists, clear line in fake screen
   {
     break-unless x:address:screen
-    n:number <- get x:address:screen/deref, num-columns:offset
+    width:number <- get x:address:screen/deref, num-columns:offset
     column:address:number <- get-address x:address:screen/deref, cursor-column:offset
     original-column:number <- copy column:address:number/deref
     # space over the entire line
@@ -264,7 +352,8 @@ container screen-cell [
     {
 #?       $print column:address:number/deref, [ 
 #? ] #? 1
-      done?:boolean <- greater-or-equal column:address:number/deref, n:number
+      right:number <- subtract width:number, 1:literal
+      done?:boolean <- greater-or-equal column:address:number/deref, right:number
       break-if done?:boolean
       print-character x:address:screen, [ ]  # implicitly updates 'column'
       loop
@@ -314,7 +403,7 @@ container screen-cell [
 scenario clear-line-erases-printed-characters [
   run [
 #?     $start-tracing #? 4
-    1:address:screen <- init-fake-screen 3:literal/width, 2:literal/height
+    1:address:screen <- new-fake-screen 3:literal/width, 2:literal/height
     # print a character
     1:address:screen <- print-character 1:address:screen, 97:literal  # 'a'
     # move cursor to start of line
@@ -501,6 +590,26 @@ container screen-cell [
   reply x:address:screen/same-as-ingredient:0
 ]
 
+scenario print-string-stops-at-right-margin [
+  run [
+    1:address:screen <- new-fake-screen 3:literal/width, 2:literal/height
+    2:address:array:character <- new [abcd]
+    1:address:screen <- print-string 1:address:screen, 2:address:array:character
+    3:address:array:screen-cell <- get 1:address:screen/deref, data:offset
+    4:array:screen-cell <- copy 3:address:array:screen-cell/deref
+  ]
+  memory-should-contain [
+    4 <- 6  # width*height
+    5 <- 97  # 'a'
+    6 <- 7  # white
+    7 <- 98  # 'b'
+    8 <- 7  # white
+    9 <- 100  # 'd' overwrites 'c'
+    10 <- 7  # white
+    11 <- 0  # unused
+  ]
+]
+
 recipe print-integer [
   default-space:address:array:location <- new location:type, 30:literal
   x:address:screen <- next-ingredient
diff --git a/html/072scenario_screen.cc.html b/html/072scenario_screen.cc.html
index 87ef1158..e14ae7de 100644
--- a/html/072scenario_screen.cc.html
+++ b/html/072scenario_screen.cc.html
@@ -12,14 +12,14 @@
 
 
@@ -164,15 +164,17 @@ Name[tmp_recipe.at(:(before "End Rewrite Instruction(curr)")
 // rewrite `assume-screen width, height` to
-// `screen:address <- init-fake-screen width, height`
+// `screen:address <- new-fake-screen width, height`
 //? cout << "before: " << curr.to_string() << '\n'; //? 1
 if (curr.name == "assume-screen") {
-  curr.operation = Recipe_number["init-fake-screen"];
+  curr.operation = Recipe_number["new-fake-screen"];
+  curr.name = "new-fake-screen";
+  assert(curr.operation);
   assert(curr.products.empty());
   curr.products.push_back(reagent("screen:address"));
   curr.products.at(0).set_value(SCREEN);
 //? cout << "after: " << curr.to_string() << '\n'; //? 1
-//? cout << "AAA " << Recipe_number["init-fake-screen"] << '\n'; //? 1
+//? cout << "AAA " << Recipe_number["new-fake-screen"] << '\n'; //? 1
 }
 
 //: screen-should-contain is a regular instruction
@@ -360,9 +362,12 @@ void dump_screen() {(Memory[screen_data_start] == screen_width*screen_height);
   long long int curr = screen_data_start+1;  // skip length
   for (long long int row = 0; row < screen_height; ++row) {
-//?     cerr << curr << ":\n"; //? 1
+//?     cerr << curr << ":\n"; //? 2
     for (long long int col = 0; col < screen_width; ++col) {
-      cerr << static_cast<char>(Memory[curr]);
+      if (Memory[curr])
+        cerr << to_unicode(Memory[curr]);
+      else
+        cerr << ' ';
       curr += /*size of screen-cell*/2;
     }
     cerr << '\n';
diff --git a/html/073scenario_screen_test.mu.html b/html/073scenario_screen_test.mu.html
index cf432dc2..229a2e90 100644
--- a/html/073scenario_screen_test.mu.html
+++ b/html/073scenario_screen_test.mu.html
@@ -12,10 +12,10 @@
 
 
diff --git a/html/074keyboard.mu.html b/html/074keyboard.mu.html
index 75e9a0e5..9769da2e 100644
--- a/html/074keyboard.mu.html
+++ b/html/074keyboard.mu.html
@@ -12,13 +12,13 @@
 
 
@@ -31,78 +31,108 @@ body { font-family: monospace; color: #eeeeee; background-color: #080808; }
 
 
 
-# Wrappers around keyboard primitives that take a 'keyboard' object and are thus
-# easier to test.
+# Wrappers around interaction primitives that take a potentially fake object
+# and are thus easier to test.
 
-# display:screen as keyboard:__? Can't think of another word.
-container keyboard [
+exclusive-container event [
+  text:character
+  keycode:number  # keys on keyboard without a unicode representation
+  touch:touch-event  # mouse, track ball, etc.
+  # update the assume-console handler if you add more variants
+]
+
+container touch-event [
+  type:number
+  row:number
+  column:number
+]
+
+container console [
   index:number
-  data:address:array:character
+  data:address:array:event
 ]
 
-recipe init-fake-keyboard [
+recipe new-fake-console [
   default-space:address:array:location <- new location:type, 30:literal
-  result:address:keyboard <- new keyboard:type
-  buf:address:address:array:character <- get-address result:address:keyboard/deref, data:offset
+  result:address:console <- new console:type
+  buf:address:address:array:character <- get-address result:address:console/deref, data:offset
 #?   $start-tracing #? 1
   buf:address:address:array:character/deref <- next-ingredient
 #?   $stop-tracing #? 1
-  idx:address:number <- get-address result:address:keyboard/deref, index:offset
+  idx:address:number <- get-address result:address:console/deref, index:offset
   idx:address:number/deref <- copy 0:literal
-  reply result:address:keyboard
+  reply result:address:console
 ]
 
-recipe read-key [
+recipe read-event [
   default-space:address:array:location <- new location:type, 30:literal
-  x:address:keyboard <- next-ingredient
+  x:address:console <- next-ingredient
   {
-    break-unless x:address:keyboard
-    idx:address:number <- get-address x:address:keyboard/deref, index:offset
-    buf:address:array:character <- get x:address:keyboard/deref, data:offset
-    max:number <- length buf:address:array:character/deref
+    break-unless x:address:console
+    idx:address:number <- get-address x:address:console/deref, index:offset
+    buf:address:array:event <- get x:address:console/deref, data:offset
     {
+      max:number <- length buf:address:array:event/deref
       done?:boolean <- greater-or-equal idx:address:number/deref, max:number
       break-unless done?:boolean
-      reply 0:literal/eof, 1:literal/found, x:address:keyboard/same-as-ingredient:0
+      dummy:address:event <- new event:type
+      reply dummy:address:event/deref, x:address:console/same-as-ingredient:0, 1:literal/found, 1:literal/quit
     }
-    c:character <- index buf:address:array:character/deref, idx:address:number/deref
+    result:event <- index buf:address:array:event/deref, idx:address:number/deref
     idx:address:number/deref <- add idx:address:number/deref, 1:literal
-    reply c:character, 1:literal/found, x:address:keyboard/same-as-ingredient:0
+    reply result:event, x:address:console/same-as-ingredient:0, 1:literal/found, 0:literal/quit
   }
-  # real keyboard input is infrequent; avoid polling it too much
+  # real event source is infrequent; avoid polling it too much
   switch
-  c:character, found?:boolean <- read-key-from-keyboard
-  reply c:character, found?:boolean, x:address:keyboard/same-as-ingredient:0
+  result:event, found?:boolean <- check-for-interaction
+  reply result:event, x:address:console/same-as-ingredient:0, found?:boolean, 0:literal/quit
 ]
 
-recipe wait-for-key [
+# variant of read-event for just keyboard events. Discards everything that
+# isn't unicode, so no arrow keys, page-up/page-down, etc. But you still get
+# newlines, tabs, ctrl-d..
+recipe read-key [
   default-space:address:array:location <- new location:type, 30:literal
-  x:address:keyboard <- next-ingredient
-  {
-    break-unless x:address:keyboard
-    # on fake keyboards 'wait-for-key' behaves just like 'read-key'
-    c:character, found?:boolean, x:address:keyboard <- read-key x:address:keyboard
-    reply c:character, x:address:keyboard/same-as-ingredient:0
-  }
-  c:character <- wait-for-key-from-keyboard
-  reply c:character, x:address:keyboard/same-as-ingredient:0
+#?   $print default-space:address:array:location #? 1
+#?   $exit #? 1
+#?   $start-tracing #? 1
+  console:address <- next-ingredient
+  x:event, console:address, found?:boolean, quit?:boolean <- read-event console:address
+#?   $print [aaa 1] #? 1
+  reply-if quit?:boolean, 0:literal, console:address/same-as-ingredient:0, found?:boolean, quit?:boolean
+#?   $print [aaa 2] #? 1
+  reply-unless found?:boolean, 0:literal, console:address/same-as-ingredient:0, found?:boolean, quit?:boolean
+#?   $print [aaa 3] #? 1
+  c:address:character <- maybe-convert x:event, text:variant
+  reply-unless c:address:character, 0:literal, console:address/same-as-ingredient:0, 0:literal/found, 0:literal/quit
+#?   $print [aaa 4] #? 1
+  reply c:address:character/deref, console:address/same-as-ingredient:0, 1:literal/found, 0:literal/quit
 ]
 
 recipe send-keys-to-channel [
   default-space:address:array:location <- new location:type, 30:literal
-  keyboard:address <- next-ingredient
+  console:address <- next-ingredient
   chan:address:channel <- next-ingredient
   screen:address <- next-ingredient
   {
-    c:character, found?:boolean, keyboard:address <- read-key keyboard:address
+    c:character, console:address, found?:boolean, quit?:boolean <- read-key console:address
     loop-unless found?:boolean
-#?     print-integer screen:address, c:character #? 1
+    break-if quit?:boolean
+    assert c:character, [invalid event, expected text]
     print-character screen:address, c:character
     chan:address:channel <- write chan:address:channel, c:character
-    # todo: eof
     loop
   }
 ]
+
+recipe wait-for-event [
+  default-space:address:array:location <- new location:type, 30:literal
+  console:address <- next-ingredient
+  {
+    _, console:address, found?:boolean <- read-event console:address
+    loop-unless found?:boolean
+  }
+]
 

 
 
diff --git a/html/075scenario_console.cc.html b/html/075scenario_console.cc.html
new file mode 100644
index 00000000..65499aa9
--- /dev/null
+++ b/html/075scenario_console.cc.html
@@ -0,0 +1,258 @@
+
+
+
+
+Mu - 075scenario_console.cc
+
+
+
+
+
+
+
+
+
+
+
+//: Clean syntax to manipulate and check the console in scenarios.
+//: Instruction 'assume-console' implicitly creates a variable called
+//: 'console' that is accessible inside other 'run' instructions in the
+//: scenario. Like with the fake screen, 'assume-console' transparently
+//: supports unicode.
+
+:(scenarios run_mu_scenario)
+:(scenario keyboard_in_scenario)
+scenario keyboard-in-scenario [
+  assume-console [
+    type [abc]
+  ]
+  run [
+    1:character, console:address, 2:boolean <- read-key console:address
+    3:character, console:address, 4:boolean <- read-key console:address
+    5:character, console:address, 6:boolean <- read-key console:address
+    7:character, console:address, 8:boolean, 9:boolean <- read-key console:address
+  ]
+  memory-should-contain [
+    1 <- 97  # 'a'
+    2 <- 1
+    3 <- 98  # 'b'
+    4 <- 1
+    5 <- 99  # 'c'
+    6 <- 1
+    7 <- 0  # unset
+    8 <- 1
+    9 <- 1  # end of test events
+  ]
+]
+
+:(before "End Scenario Globals")
+const long long int CONSOLE = Next_predefined_global_for_scenarios++;
+:(before "End Predefined Scenario Locals In Run")
+Name[tmp_recipe.at(0)]["console"] = CONSOLE;
+
+//: allow naming just for 'console'
+:(before "End is_special_name Cases")
+if (s == "console") return true;
+
+//: Unlike assume-keyboard, assume-console is easiest to implement as just a
+//: primitive recipe.
+:(before "End Primitive Recipe Declarations")
+ASSUME_CONSOLE,
+:(before "End Primitive Recipe Numbers")
+Recipe_number["assume-console"] = ASSUME_CONSOLE;
+:(before "End Primitive Recipe Implementations")
+case ASSUME_CONSOLE: {
+//?   cerr << "aaa: " << current_instruction().ingredients.at(0).name << '\n'; //? 2
+  // create a temporary recipe just for parsing; it won't contain valid instructions
+  istringstream in("[" + current_instruction().ingredients.at(0).name + "]");
+  recipe r = slurp_recipe(in);
+  long long int num_events = count_events(r);
+//?   cerr << "fff: " << num_events << '\n'; //? 3
+  // initialize the events
+  long long int size = num_events*size_of_event() + /*space for length*/1;
+  ensure_space(size);
+  long long int event_data_address = Current_routine->alloc;
+  Memory[event_data_address] = num_events;
+  ++Current_routine->alloc;
+  for (long long int i = 0; i < SIZE(r.steps); ++i) {
+    const instruction& curr = r.steps.at(i);
+    if (curr.name == "left-click") {
+      Memory[Current_routine->alloc] = /*tag for 'touch-event' variant of 'event' exclusive-container*/2;
+      Memory[Current_routine->alloc+1+/*offset of 'type' in 'mouse-event'*/0] = TB_KEY_MOUSE_LEFT;
+      Memory[Current_routine->alloc+1+/*offset of 'row' in 'mouse-event'*/1] = to_integer(curr.ingredients.at(0).name);
+      Memory[Current_routine->alloc+1+/*offset of 'column' in 'mouse-event'*/2] = to_integer(curr.ingredients.at(1).name);
+//?       cerr << "AA left click: " << Memory[Current_routine->alloc+2] << ' ' << Memory[Current_routine->alloc+3] << '\n'; //? 1
+      Current_routine->alloc += size_of_event();
+    }
+    else if (curr.name == "press") {
+      Memory[Current_routine->alloc] = /*tag for 'keycode' variant of 'event' exclusive-container*/1;
+      Memory[Current_routine->alloc+1] = to_integer(curr.ingredients.at(0).name);
+//?       cerr << "AA press: " << Memory[Current_routine->alloc+1] << '\n'; //? 3
+      Current_routine->alloc += size_of_event();
+    }
+    // End Event Handlers
+    else {
+      // keyboard input
+      assert(curr.name == "type");
+      const string& contents = curr.ingredients.at(0).name;
+      const char* raw_contents = contents.c_str();
+      long long int num_keyboard_events = unicode_length(contents);
+      long long int curr = 0;
+//?       cerr << "AAA: " << num_keyboard_events << '\n'; //? 1
+      for (long long int i = 0; i < num_keyboard_events; ++i) {
+        Memory[Current_routine->alloc] = /*tag for 'text' variant of 'event' exclusive-container*/0;
+        uint32_t curr_character;
+        assert(curr < SIZE(contents));
+        tb_utf8_char_to_unicode(&curr_character, &raw_contents[curr]);
+//?         cerr << "AA keyboard: " << curr_character << '\n'; //? 3
+        Memory[Current_routine->alloc+/*skip exclusive container tag*/1] = curr_character;
+        curr += tb_utf8_char_length(raw_contents[curr]);
+        Current_routine->alloc += size_of_event();
+      }
+    }
+  }
+  assert(Current_routine->alloc == event_data_address+size);
+  // wrap the array of events in an event object
+  ensure_space(size_of_events());
+  Memory[CONSOLE] = Current_routine->alloc;
+  Current_routine->alloc += size_of_events();
+//?   cerr << "writing " << event_data_address << " to location " << Memory[CONSOLE]+1 << '\n'; //? 1
+  Memory[Memory[CONSOLE]+/*offset of 'data' in container 'events'*/1] = event_data_address;
+//?   cerr << Memory[Memory[CONSOLE]+1] << '\n'; //? 1
+//?   cerr << "alloc now " << Current_routine->alloc << '\n'; //? 1
+  break;
+}
+
+:(scenario events_in_scenario)
+scenario events-in-scenario [
+  assume-console [
+    type [abc]
+    left-click 0, 1
+    press 65515  # up arrow
+    type [d]
+  ]
+  run [
+    # 3 keyboard events; each event occupies 4 locations
+#?     $start-tracing #? 2
+    1:event <- read-event console:address
+    5:event <- read-event console:address
+    9:event <- read-event console:address
+    # mouse click
+    13:event <- read-event console:address
+    # non-character keycode
+    17:event <- read-event console:address
+    # final keyboard event
+    21:event <- read-event console:address
+  ]
+  memory-should-contain [
+    1 <- 0  # 'text'
+    2 <- 97  # 'a'
+    3 <- 0  # unused
+    4 <- 0  # unused
+    5 <- 0  # 'text'
+    6 <- 98  # 'b'
+    7 <- 0  # unused
+    8 <- 0  # unused
+    9 <- 0  # 'text'
+    10 <- 99  # 'c'
+    11 <- 0  # unused
+    12 <- 0  # unused
+    13 <- 2  # 'mouse'
+    14 <- 65513  # mouse click
+    15 <- 0  # row
+    16 <- 1  # column
+    17 <- 1  # 'keycode'
+    18 <- 65515  # up arrow
+    19 <- 0  # unused
+    20 <- 0  # unused
+    21 <- 0  # 'text'
+    22 <- 100  # 'd'
+    23 <- 0  # unused
+    24 <- 0  # unused
+    25 <- 0
+  ]
+]
+
+//: Deal with special keys and unmatched brackets by allowing each test to
+//: independently choose the unicode symbol to denote them.
+:(before "End Primitive Recipe Declarations")
+REPLACE_IN_CONSOLE,
+:(before "End Primitive Recipe Numbers")
+Recipe_number["replace-in-console"] = REPLACE_IN_CONSOLE;
+:(before "End Primitive Recipe Implementations")
+case REPLACE_IN_CONSOLE: {
+  assert(scalar(ingredients.at(0)));
+//?   cerr << "console: " << Memory[CONSOLE] << '\n'; //? 1
+  if (!Memory[CONSOLE])
+    raise << "console not initialized\n" << die();
+  long long int console_data = Memory[Memory[CONSOLE]+1];
+//?   cerr << "console data starts at " << console_data << '\n'; //? 1
+  long long int size = Memory[console_data];  // array size
+//?   cerr << "size of console data is " << size << '\n'; //? 1
+  for (long long int i = 0, curr = console_data+1; i < size; ++i, curr+=size_of_event()) {
+//?     cerr << curr << '\n'; //? 1
+    if (Memory[curr] != /*text*/0) continue;
+    if (Memory[curr+1] != ingredients.at(0).at(0)) continue;
+    for (long long int n = 0; n < size_of_event(); ++n)
+      Memory[curr+n] = ingredients.at(1).at(n);
+  }
+  break;
+}
+
+:(code)
+long long int count_events(const recipe& r) {
+  long long int result = 0;
+  for (long long int i = 0; i < SIZE(r.steps); ++i) {
+    const instruction& curr = r.steps.at(i);
+//?     cerr << "aa: " << curr.name << '\n'; //? 3
+//?     cerr << "bb: " << curr.ingredients.at(0).name << '\n'; //? 1
+    if (curr.name == "type")
+      result += unicode_length(curr.ingredients.at(0).name);
+    else
+      result++;
+//?     cerr << "cc: " << result << '\n'; //? 1
+  }
+  return result;
+}
+
+long long int size_of_event() {
+  // memoize result if already computed
+  static long long int result = 0;
+  if (result) return result;
+  vector<type_number> type;
+  type.push_back(Type_number["event"]);
+  result = size_of(type);
+  return result;
+}
+
+long long int size_of_events() {
+  // memoize result if already computed
+  static long long int result = 0;
+  if (result) return result;
+  vector<type_number> type;
+  assert(Type_number["console"]);
+  type.push_back(Type_number["console"]);
+  result = size_of(type);
+  return result;
+}
+

+
+
+
diff --git a/html/075scenario_keyboard.cc.html b/html/075scenario_keyboard.cc.html
index b58ca988..7657b451 100644
--- a/html/075scenario_keyboard.cc.html
+++ b/html/075scenario_keyboard.cc.html
@@ -12,13 +12,13 @@
 
 
 
diff --git a/html/076scenario_console_test.mu.html b/html/076scenario_console_test.mu.html
new file mode 100644
index 00000000..a3fa6101
--- /dev/null
+++ b/html/076scenario_console_test.mu.html
@@ -0,0 +1,59 @@
+
+
+
+
+Mu - 076scenario_console_test.mu
+
+
+
+
+
+
+
+
+
+
+
+# To check our support for consoles in scenarios, rewrite tests from
+# scenario_console.mu
+# Tests for console interface.
+
+scenario read-key-in-mu [
+  assume-console [
+    type [abc]
+  ]
+  run [
+    1:character, console:address, 2:boolean <- read-key console:address
+    3:character, console:address, 4:boolean <- read-key console:address
+    5:character, console:address, 6:boolean <- read-key console:address
+    7:character, console:address, 8:boolean <- read-key console:address
+  ]
+  memory-should-contain [
+    1 <- 97  # 'a'
+    2 <- 1
+    3 <- 98  # 'b'
+    4 <- 1
+    5 <- 99  # 'c'
+    6 <- 1
+    7 <- 0  # eof
+    8 <- 1
+  ]
+]
+

+
+
+
diff --git a/html/076scenario_keyboard_test.mu.html b/html/076scenario_keyboard_test.mu.html
index 9cc3b21a..ec148812 100644
--- a/html/076scenario_keyboard_test.mu.html
+++ b/html/076scenario_keyboard_test.mu.html
@@ -12,10 +12,10 @@
 
 
diff --git a/html/077mouse.cc.html b/html/077mouse.cc.html
index 0c3f775e..bf7f11b8 100644
--- a/html/077mouse.cc.html
+++ b/html/077mouse.cc.html
@@ -12,12 +12,12 @@
 
 
 
diff --git a/html/077trace_browser.cc.html b/html/077trace_browser.cc.html
index 87447353..8fa5bf00 100644
--- a/html/077trace_browser.cc.html
+++ b/html/077trace_browser.cc.html
@@ -12,13 +12,13 @@
 
 
 
diff --git a/html/078run_interactive.cc.html b/html/078run_interactive.cc.html
index b8166497..834924c2 100644
--- a/html/078run_interactive.cc.html
+++ b/html/078run_interactive.cc.html
@@ -12,13 +12,13 @@
 
 
diff --git a/html/080trace_browser.cc.html b/html/080trace_browser.cc.html
index 62ad443a..7659e81a 100644
--- a/html/080trace_browser.cc.html
+++ b/html/080trace_browser.cc.html
@@ -12,13 +12,13 @@
 
 
 
diff --git a/html/081run_interactive.cc.html b/html/081run_interactive.cc.html
index a271fe60..35ce1476 100644
--- a/html/081run_interactive.cc.html
+++ b/html/081run_interactive.cc.html
@@ -12,13 +12,13 @@
 
 
diff --git a/html/999spaces.cc.html b/html/999spaces.cc.html
index 4294eaad..784a5cd5 100644
--- a/html/999spaces.cc.html
+++ b/html/999spaces.cc.html
@@ -12,10 +12,10 @@
 
 
diff --git a/html/callcc.mu.html b/html/callcc.mu.html
index 42dda8e5..e16e87c4 100644
--- a/html/callcc.mu.html
+++ b/html/callcc.mu.html
@@ -12,11 +12,11 @@
 
 
diff --git a/html/channel.mu.html b/html/channel.mu.html
index 82a17f6f..14530ec8 100644
--- a/html/channel.mu.html
+++ b/html/channel.mu.html
@@ -12,12 +12,12 @@
 
 
@@ -66,7 +66,7 @@ body { font-family: monospace; color: #eeeeee; background-color: #080808; }
 
 recipe main [
   default-space:address:array:location <- new location:type, 30:literal
-  chan:address:channel <- init-channel 3:literal
+  chan:address:channel <- new-channel 3:literal
   # create two background 'routines' that communicate by a channel
   routine1:number <- start-running producer:recipe, chan:address:channel
   routine2:number <- start-running consumer:recipe, chan:address:channel
diff --git a/html/chessboard.mu.html b/html/chessboard.mu.html
index 046395e3..ad6d9e2d 100644
--- a/html/chessboard.mu.html
+++ b/html/chessboard.mu.html
@@ -12,15 +12,15 @@
 
 
@@ -38,7 +38,7 @@ body { font-family: monospace; color: #eeeeee; background-color: #080808; }
 
 # recipes are mu's names for functions
 recipe main [
-  switch-to-display  # take control of screen and keyboard
+  open-console  # take control of screen, keyboard and mouse
 
   # The chessboard recipe takes keyboard and screen objects as 'ingredients'.
   #
@@ -50,11 +50,11 @@ body { font-family: monospace; color: #eeeeee; background-color: #080808; }
   # results. Here we clearly modify both keyboard and screen, so we return
   # both.
   #
-  # Here the keyboard and screen are both 0, which usually indicates real
+  # Here the console and screen are both 0, which usually indicates real
   # hardware rather than a fake for testing as you'll see below.
-  0:literal/real-screen, 0:literal/real-keyboard <- chessboard 0:literal/real-screen, 0:literal/real-keyboard
+  0:literal/screen, 0:literal/console <- chessboard 0:literal/screen, 0:literal/console
 
-  return-to-console  # cleanup screen and keyboard
+  close-console  # cleanup screen, keyboard and mouse
 ]
 
 ## But enough about mu. Here's what it looks like to run the chessboard program.
@@ -64,10 +64,12 @@ body { font-family: monospace; color: #eeeeee; background-color: #080808; }
   # we'll make the screen really wide because the program currently prints out a long line
   assume-screen 120:literal/width, 20:literal/height
   # initialize keyboard to type in a move
-  assume-keyboard [a2-a4
+  assume-console [
+    type [a2-a4
 ]
+  ]
   run [
-    screen:address, keyboard:address <- chessboard screen:address, keyboard:address
+    screen:address, console:address <- chessboard screen:address, console:address
 #?     $browse-trace #? 1
 #?     $close-trace #? 1
     # icon for the cursor
@@ -99,6 +101,17 @@ body { font-family: monospace; color: #eeeeee; background-color: #080808; }
   ]
 ]
 
+#? scenario foo [ #? 1
+#?   $print [aaa] #? 1
+#?   run [ #? 1
+#?     1:number <- copy 34:literal #? 1
+#?   ] #? 1
+#?   memory-should-contain [ #? 1
+#?     1 <- 34 #? 1
+#?   ] #? 1
+#?   $print [zzz] #? 1
+#? ] #? 1
+
 ## Here's how 'chessboard' is implemented.
 
 recipe chessboard [
@@ -106,15 +119,15 @@ body { font-family: monospace; color: #eeeeee; background-color: #080808; }
 #?   $start-tracing #? 1
   default-space:address:array:location <- new location:type, 30:literal
   screen:address <- next-ingredient
-  keyboard:address <- next-ingredient
-#?   $print [screen: ], screen:address, [, keyboard: ], keyboard:address, [ 
+  console:address <- next-ingredient
+#?   $print [screen: ], screen:address, [, console: ], console:address, [ 
 #? ] #? 1
   board:address:array:address:array:character <- initial-position
   # hook up stdin
-  stdin:address:channel <- init-channel 10:literal/capacity
-  start-running send-keys-to-channel:recipe, keyboard:address, stdin:address:channel, screen:address
+  stdin:address:channel <- new-channel 10:literal/capacity
+  start-running send-keys-to-channel:recipe, console:address, stdin:address:channel, screen:address
   # buffer lines in stdin
-  buffered-stdin:address:channel <- init-channel 10:literal/capacity
+  buffered-stdin:address:channel <- new-channel 10:literal/capacity
   start-running buffer-lines:recipe, stdin:address:channel, buffered-stdin:address:channel
   {
     msg:address:array:character <- new [Stupid text-mode chessboard. White pieces in uppercase; black pieces in lowercase. No checking for legal moves.
@@ -159,7 +172,7 @@ body { font-family: monospace; color: #eeeeee; background-color: #080808; }
 
 ## a board is an array of files, a file is an array of characters (squares)
 
-recipe init-board [
+recipe new-board [
   default-space:address:array:location <- new location:type, 30:literal
   initial-position:address:array:number <- next-ingredient
   # assert(length(initial-position) == 64)
@@ -173,14 +186,14 @@ body { font-family: monospace; color: #eeeeee; background-color: #080808; }
     done?:boolean <- equal col:number, 8:literal
     break-if done?:boolean
     file:address:address:array:character <- index-address board:address:array:address:array:character/deref, col:number
-    file:address:address:array:character/deref <- init-file initial-position:address:array:number, col:number
+    file:address:address:array:character/deref <- new-file initial-position:address:array:number, col:number
     col:number <- add col:number, 1:literal
     loop
   }
   reply board:address:array:address:array:character
 ]
 
-recipe init-file [
+recipe new-file [
   default-space:address:array:location <- new location:type, 30:literal
   position:address:array:number <- next-ingredient
   index:number <- next-ingredient
@@ -259,7 +272,7 @@ body { font-family: monospace; color: #eeeeee; background-color: #080808; }
   #   B P _ _ _ _ p B
   #   N P _ _ _ _ p n
   #   R P _ _ _ _ p r
-  initial-position:address:array:number <- init-array 82:literal/R, 80:literal/P, 32:literal/blank, 32:literal/blank, 32:literal/blank, 32:literal/blank, 112:literal/p, 114:literal/r, 78:literal/N, 80:literal/P, 32:literal/blank, 32:literal/blank, 32:literal/blank, 32:literal/blank, 112:literal/p, 110:literal/n, 66:literal/B, 80:literal/P, 32:literal/blank, 32:literal/blank, 32:literal/blank, 32:literal/blank, 112:literal/p, 98:literal/b, 81:literal/Q, 80:literal/P, 32:literal/blank, 32:literal/blank, 32:literal/blank, 32:literal/blank, 112:literal/p, 113:literal/q, 75:literal/K, 80:literal/P, 32:literal/blank, 32:literal/blank, 32:literal/blank, 32:literal/blank, 112:literal/p, 107:literal/k, 66:literal/B, 80:literal/P, 32:literal/blank, 32:literal/blank, 32:literal/blank, 32:literal/blank, 112:literal/p, 98:literal/b, 78:literal/N, 80:literal/P, 32:literal/blank, 32:literal/blank, 32:literal/blank, 32:literal/blank, 112:literal/p, 110:literal/n, 82:literal/R, 80:literal/P, 32:literal/blank, 32:literal/blank, 32:literal/blank, 32:literal/blank, 112:literal/p, 114:literal/r
+  initial-position:address:array:number <- new-array 82:literal/R, 80:literal/P, 32:literal/blank, 32:literal/blank, 32:literal/blank, 32:literal/blank, 112:literal/p, 114:literal/r, 78:literal/N, 80:literal/P, 32:literal/blank, 32:literal/blank, 32:literal/blank, 32:literal/blank, 112:literal/p, 110:literal/n, 66:literal/B, 80:literal/P, 32:literal/blank, 32:literal/blank, 32:literal/blank, 32:literal/blank, 112:literal/p, 98:literal/b, 81:literal/Q, 80:literal/P, 32:literal/blank, 32:literal/blank, 32:literal/blank, 32:literal/blank, 112:literal/p, 113:literal/q, 75:literal/K, 80:literal/P, 32:literal/blank, 32:literal/blank, 32:literal/blank, 32:literal/blank, 112:literal/p, 107:literal/k, 66:literal/B, 80:literal/P, 32:literal/blank, 32:literal/blank, 32:literal/blank, 32:literal/blank, 112:literal/p, 98:literal/b, 78:literal/N, 80:literal/P, 32:literal/blank, 32:literal/blank, 32:literal/blank, 32:literal/blank, 112:literal/p, 110:literal/n, 82:literal/R, 80:literal/P, 32:literal/blank, 32:literal/blank, 32:literal/blank, 32:literal/blank, 112:literal/p, 114:literal/r
 #?       82:literal/R, 80:literal/P, 32:literal/blank, 32:literal/blank, 32:literal/blank, 32:literal/blank, 112:literal/p, 114:literal/r,
 #?       78:literal/N, 80:literal/P, 32:literal/blank, 32:literal/blank, 32:literal/blank, 32:literal/blank, 112:literal/p, 110:literal/n,
 #?       66:literal/B, 80:literal/P, 32:literal/blank, 32:literal/blank, 32:literal/blank, 32:literal/blank, 112:literal/p, 98:literal/b, 
@@ -268,7 +281,7 @@ body { font-family: monospace; color: #eeeeee; background-color: #080808; }
 #?       66:literal/B, 80:literal/P, 32:literal/blank, 32:literal/blank, 32:literal/blank, 32:literal/blank, 112:literal/p, 98:literal/b,
 #?       78:literal/N, 80:literal/P, 32:literal/blank, 32:literal/blank, 32:literal/blank, 32:literal/blank, 112:literal/p, 110:literal/n,
 #?       82:literal/R, 80:literal/P, 32:literal/blank, 32:literal/blank, 32:literal/blank, 32:literal/blank, 112:literal/p, 114:literal/r
-  board:address:array:address:array:character <- init-board initial-position:address:array:number
+  board:address:array:address:array:character <- new-board initial-position:address:array:number
   reply board:address:array:address:array:character
 ]
 
@@ -316,7 +329,7 @@ container move [
   from-file:number, quit?:boolean, error?:boolean <- read-file stdin:address:channel, screen:address
   reply-if quit?:boolean, 0:literal/dummy, quit?:boolean, error?:boolean
   reply-if error?:boolean, 0:literal/dummy, quit?:boolean, error?:boolean
-#?   return-to-console #? 1
+#?   close-console #? 1
   # construct the move object
   result:address:move <- new move:type
   x:address:number <- get-address result:address:move/deref, from-file:offset
@@ -463,7 +476,7 @@ container move [
   assume-screen 20:literal/width, 2:literal/height
   run [
 #?     $start-tracing #? 1
-    1:address:channel <- init-channel 2:literal
+    1:address:channel <- new-channel 2:literal
 #?     $print [aaa channel address: ], 1:address:channel, [ 
 #? ] #? 1
     2:number/routine <- start-running read-move:recipe, 1:address:channel, screen:address
@@ -556,7 +569,7 @@ F read-move-blocking: routine failed to terminate on newline]
 scenario read-move-quit [
   assume-screen 20:literal/width, 2:literal/height
   run [
-    1:address:channel <- init-channel 2:literal
+    1:address:channel <- new-channel 2:literal
     2:number/routine <- start-running read-move:recipe, 1:address:channel, screen:address
     # 'read-move' is waiting for input
     wait-for-routine 2:number
@@ -583,7 +596,7 @@ F read-move-quit: routine failed to terminate on 'q']
 scenario read-move-illegal-file [
   assume-screen 20:literal/width, 2:literal/height
   run [
-    1:address:channel <- init-channel 2:literal
+    1:address:channel <- new-channel 2:literal
     2:number/routine <- start-running read-move:recipe, 1:address:channel, screen:address
     # 'read-move' is waiting for input
     wait-for-routine 2:number
@@ -604,7 +617,7 @@ F read-move-file: routine failed to pause after co
 scenario read-move-illegal-rank [
   assume-screen 20:literal/width, 2:literal/height
   run [
-    1:address:channel <- init-channel 2:literal
+    1:address:channel <- new-channel 2:literal
     2:number/routine <- start-running read-move:recipe, 1:address:channel, screen:address
     # 'read-move' is waiting for input
     wait-for-routine 2:number
@@ -626,7 +639,7 @@ F read-move-file: routine failed to pause after co
 scenario read-move-empty [
   assume-screen 20:literal/width, 2:literal/height
   run [
-    1:address:channel <- init-channel 2:literal
+    1:address:channel <- new-channel 2:literal
     2:number/routine <- start-running read-move:recipe, 1:address:channel, screen:address
     # 'read-move' is waiting for input
     wait-for-routine 2:number
diff --git a/html/console.mu.html b/html/console.mu.html
new file mode 100644
index 00000000..098c7e43
--- /dev/null
+++ b/html/console.mu.html
@@ -0,0 +1,50 @@
+
+
+
+
+Mu - console.mu
+
+
+
+
+
+
+
+
+
+
+
+# example program: reading events from keyboard or mouse
+#
+# Keeps printing 'a' until you press a key or click on the mouse.
+
+recipe main [
+  open-console
+  {
+    _, found?:boolean <- check-for-interaction
+    break-if found?:boolean
+    print-character-to-display 97:literal, 7:literal/white
+    loop
+  }
+  close-console
+]
+

+
+
+
diff --git a/html/counters.mu.html b/html/counters.mu.html
index 1846c64e..9129fed8 100644
--- a/html/counters.mu.html
+++ b/html/counters.mu.html
@@ -12,11 +12,11 @@
 
 
@@ -32,7 +32,7 @@ body { font-family: monospace; color: #eeeeee; background-color: #080808; }
 # example program: maintain multiple counters with isolated lexical scopes
 # (spaces)
 
-recipe init-counter [
+recipe new-counter [
   default-space:address:array:location <- new location:type, 30:literal
   n:number <- next-ingredient
   reply default-space:address:array:location
@@ -40,7 +40,7 @@ body { font-family: monospace; color: #eeeeee; background-color: #080808; }
 
 recipe increment-counter [
   default-space:address:array:location <- new location:type, 30:literal
-  0:address:array:location/names:init-counter <- next-ingredient  # setup outer space; it *must* come from 'init-counter'
+  0:address:array:location/names:new-counter <- next-ingredient  # setup outer space; it *must* come from 'new-counter'
   x:number <- next-ingredient
   n:number/space:1 <- add n:number/space:1, x:number
   reply n:number/space:1
@@ -49,9 +49,9 @@ body { font-family: monospace; color: #eeeeee; background-color: #080808; }
 recipe main [
   default-space:address:array:location <- new location:type, 30:literal
   # counter A
-  a:address:array:location <- init-counter 34:literal
+  a:address:array:location <- new-counter 34:literal
   # counter B
-  b:address:array:location <- init-counter 23:literal
+  b:address:array:location <- new-counter 23:literal
   # increment both by 2 but in different ways
   increment-counter a:address:array:location, 1:literal
   b-value:number <- increment-counter b:address:array:location, 2:literal
diff --git a/html/display.mu.html b/html/display.mu.html
index efae38f5..2137d471 100644
--- a/html/display.mu.html
+++ b/html/display.mu.html
@@ -12,10 +12,11 @@
 
 
@@ -31,26 +32,27 @@ body { font-family: monospace; color: #eeeeee; background-color: #080808; }
 # example program: managing the display
 
 recipe main [
-  switch-to-display
-  print-character-to-display 97:literal, 2:literal/red
+  open-console
+  print-character-to-display 97:literal, 1:literal/red
   1:number/raw, 2:number/raw <- cursor-position-on-display
-  wait-for-key-from-keyboard
+  wait-for-some-interaction
   clear-display
   move-cursor-on-display 0:literal, 4:literal
   print-character-to-display 98:literal
-  wait-for-key-from-keyboard
+  wait-for-some-interaction
   move-cursor-on-display 0:literal, 0:literal
   clear-line-on-display
-  wait-for-key-from-keyboard
+  wait-for-some-interaction
   move-cursor-down-on-display
-  wait-for-key-from-keyboard
+  wait-for-some-interaction
   move-cursor-right-on-display
-  wait-for-key-from-keyboard
+  wait-for-some-interaction
   move-cursor-left-on-display
-  wait-for-key-from-keyboard
+  wait-for-some-interaction
   move-cursor-up-on-display
-  wait-for-key-from-keyboard
-  return-to-console
+  wait-for-some-interaction
+#?   $print [aaa] #? 1
+  close-console
 ]
diff --git a/html/edit.mu.html b/html/edit.mu.html index 16ba4cac..574c5281 100644 --- a/html/edit.mu.html +++ b/html/edit.mu.html @@ -12,13 +12,15 @@ @@ -31,139 +33,480 @@ body { font-family: monospace; color: #eeeeee; background-color: #080808; } 
+# Editor widget: takes a string and screen coordinates, modifying them in place.
+
 recipe main [
   default-space:address:array:location <- new location:type, 30:literal
-  switch-to-display
+  open-console
   width:number <- display-width
-  {
-    wide-enough?:boolean <- greater-than width:number, 100:literal
-    break-if wide-enough?:boolean
-    return-to-console
-    assert wide-enough?:boolean, [screen too narrow; we don't support less than 100 characters yet]
-  }
+  height:number <- display-height
   divider:number, _ <- divide-with-remainder width:number, 2:literal
-  draw-column 0:literal/screen, divider:number
-  x:address:array:character <- new [1:integer <- add 2:literal, 2:literal]
-  y:address:array:character <- edit x:address:array:character, 0:literal/screen, 0:literal, 0:literal, 5:literal, divider:number
-#?   draw-bounding-box 0:literal/screen, 0:literal, 0:literal, 5:literal, divider:number
-  left:number <- add divider:number, 1:literal
-  y:address:array:character <- edit 0:literal, 0:literal/screen, 0:literal, left:number, 2:literal, width:number
-  move-cursor 0:literal/screen, 0:literal, 0:literal
-  wait-for-key-from-keyboard
-  return-to-console
-]
-
-recipe draw-column [
+  draw-vertical 0:literal/screen, divider:number, 0:literal/top, height:number
+  in:address:array:character <- new [abcdef
+def
+ghi
+jkl
+]
+  editor:address:editor-data <- new-editor in:address:array:character, 0:literal/screen, 0:literal/top, 0:literal/left, divider:number/right
+  event-loop 0:literal/screen, 0:literal/events, editor:address:editor-data
+  close-console
+]
+
+scenario editor-initially-prints-string-to-screen [
+  assume-screen 10:literal/width, 5:literal/height
+  run [
+    s:address:array:character <- new [abc]
+    new-editor s:address:array:character, screen:address, 0:literal/top, 0:literal/left, 5:literal/right
+  ]
+  screen-should-contain [
+    .abc       .
+    .          .
+  ]
+]
+
+## In which we introduce the editor data structure, and show how it displays
+## text to the screen.
+
+container editor-data [
+  # doubly linked list of characters
+  data:address:duplex-list
+  # location of top-left of screen inside data (scrolling)
+  top-of-screen:address:duplex-list
+  # location of cursor inside data
+  cursor:address:duplex-list
+
+  screen:address:screen
+  # raw bounds of display area on screen
+  top:number
+  left:number
+  bottom:number
+  right:number
+  # raw screen coordinates of cursor
+  cursor-row:number
+  cursor-column:number
+]
+
+# editor:address, screen:address <- new-editor s:address:array:character, screen:address, top:number, left:number, bottom:number
+# creates a new editor widget and renders its initial appearance to screen.
+#   top/left/right constrain the screen area available to the new editor.
+#   right is exclusive.
+recipe new-editor [
   default-space:address:array:location <- new location:type, 30:literal
+  s:address:array:character <- next-ingredient
   screen:address <- next-ingredient
-  col:number <- next-ingredient
-  curr:number <- copy 0:literal
-  max:number <- screen-height screen:address
+  # no clipping of bounds
+  top:number <- next-ingredient
+  left:number <- next-ingredient
+  right:number <- next-ingredient
+  right:number <- subtract right:number, 1:literal
+  result:address:editor-data <- new editor-data:type
+  # initialize screen-related fields
+  sc:address:address:screen <- get-address result:address:editor-data/deref, screen:offset
+  sc:address:address:screen/deref <- copy screen:address
+  x:address:number <- get-address result:address:editor-data/deref, top:offset
+  x:address:number/deref <- copy top:number
+  x:address:number <- get-address result:address:editor-data/deref, left:offset
+  x:address:number/deref <- copy left:number
+  x:address:number <- get-address result:address:editor-data/deref, right:offset
+  x:address:number/deref <- copy right:number
+  # initialize bottom to top for starters
+  x:address:number <- get-address result:address:editor-data/deref, bottom:offset
+  x:address:number/deref <- copy top:number
+  # initialize cursor
+  x:address:number <- get-address result:address:editor-data/deref, cursor-row:offset
+  x:address:number/deref <- copy top:number
+  x:address:number <- get-address result:address:editor-data/deref, cursor-column:offset
+  x:address:number/deref <- copy left:number
+  # early exit if s is empty
+  reply-unless s:address:array:character, result:address:editor-data
+  len:number <- length s:address:array:character/deref
+  reply-unless len:number, result:address:editor-data
+  idx:number <- copy 0:literal
+  # s is guaranteed to have at least one character, so initialize result's
+  # duplex-list
+  init:address:address:duplex-list <- get-address result:address:editor-data/deref, top-of-screen:offset
+  init:address:address:duplex-list/deref <- copy 0:literal
+  c:character <- index s:address:array:character/deref, idx:number
+  idx:number <- add idx:number, 1:literal
+  init:address:address:duplex-list/deref <- push c:character, init:address:address:duplex-list/deref
+  curr:address:duplex-list <- copy init:address:address:duplex-list/deref
+  # now we can start appending the rest, character by character
   {
-    continue?:boolean <- lesser-than curr:number, max:number
-    break-unless continue?:boolean
-    move-cursor screen:address, curr:number, col:number
-    print-character screen:address, 9474:literal/vertical, 245:literal/grey
-    curr:number <- add curr:number, 1:literal
+#?     $print idx:number, [ vs ], len:number, [ 
+#? ] #? 1
+    done?:boolean <- greater-or-equal idx:number, len:number
+    break-if done?:boolean
+    c:character <- index s:address:array:character/deref, idx:number
+#?     $print [aa: ], c:character, [ 
+#? ] #? 1
+    insert-duplex c:character, curr:address:duplex-list
+    # next iter
+    curr:address:duplex-list <- next-duplex curr:address:duplex-list
+    idx:number <- add idx:number, 1:literal
     loop
   }
-  move-cursor screen:address, 0:literal, 0:literal
+  # initialize cursor to top of screen
+  y:address:address:duplex-list <- get-address result:address:editor-data/deref, cursor:offset
+  y:address:address:duplex-list/deref <- copy init:address:address:duplex-list/deref
+  # perform initial rendering to screen
+  bottom:address:number <- get-address result:address:editor-data/deref, bottom:offset
+  bottom:address:number/deref, screen:address <- render result:address:editor-data, screen:address, top:number, left:number, right:number
+  reply result:address:editor-data
+]
+
+scenario editor-initializes-without-data [
+  assume-screen 5:literal/width, 3:literal/height
+  run [
+    1:address:editor-data <- new-editor 0:literal/data, screen:address, 1:literal/top, 2:literal/left, 5:literal/right
+    2:editor-data <- copy 1:address:editor-data/deref
+  ]
+  memory-should-contain [
+    2 <- 0  # data
+    3 <- 0  # pointer into data to top of screen
+    4 <- 0  # pointer into data to cursor
+    # 5 <- screen
+    6 <- 1  # top
+    7 <- 2  # left
+    8 <- 1  # bottom
+    9 <- 4  # right  (inclusive)
+    10 <- 1  # cursor row
+    11 <- 2  # cursor column
+  ]
+  screen-should-contain [
+    .     .
+    .     .
+    .     .
+  ]
 ]
 
-recipe edit [
+recipe render [
   default-space:address:array:location <- new location:type, 30:literal
-  in:address:array:character <- next-ingredient
+  editor:address:editor-data <- next-ingredient
   screen:address <- next-ingredient
   top:number <- next-ingredient
   left:number <- next-ingredient
-  bottom:number <- next-ingredient
+  screen-height:number <- screen-height screen:address
   right:number <- next-ingredient
-  # draw bottom boundary
-  curr:number <- copy left:number
+  cursor:address:duplex-list <- get editor:address:editor-data/deref, cursor:offset
+  # traversing editor
+  curr:address:duplex-list <- get editor:address:editor-data/deref, top-of-screen:offset
+  # traversing screen
+  row:number <- copy top:number
+  column:number <- copy left:number
+  move-cursor screen:address, row:number, column:number
   {
-    continue?:boolean <- lesser-than curr:number, right:number
-    break-unless continue?:boolean
-    move-cursor screen:address, bottom:number, curr:number
-    print-character screen:address, 9472:literal/vertical, 245:literal/grey
-    curr:number <- add curr:number, 1:literal
+    +next-character
+#?     $print curr:address:duplex-list, [ 
+#? ] #? 1
+    break-unless curr:address:duplex-list
+    off-screen?:boolean <- greater-or-equal row:number, screen-height:number
+    break-if off-screen?:boolean
+    {
+      at-cursor?:boolean <- equal curr:address:duplex-list, cursor:address:duplex-list
+      break-unless at-cursor?:boolean
+      cursor-row:number <- copy row:number
+      cursor-column:number <- copy column:number
+    }
+    c:character <- get curr:address:duplex-list/deref, value:offset
+    {
+      # newline? move to left rather than 0
+      newline?:boolean <- equal c:character, 10:literal/newline
+      break-unless newline?:boolean
+      row:number <- add row:number, 1:literal
+      column:number <- copy left:number
+      move-cursor screen:address, row:number, column:number
+      curr:address:duplex-list <- next-duplex curr:address:duplex-list
+      loop +next-character:label
+    }
+    {
+      # at right? more than one letter left in the line? wrap
+      at-right?:boolean <- equal column:number, right:number
+      break-unless at-right?:boolean
+      next-node:address:duplex-list <- next-duplex curr:address:duplex-list
+      break-unless next-node:address:duplex-list
+      next:character <- get next-node:address:duplex-list/deref, value:offset
+      next-character-is-newline?:boolean <- equal next:character, 10:literal/newline
+      break-if next-character-is-newline?:boolean
+      # wrap
+      print-character screen:address, 8617:literal/loop-back-to-left, 245:literal/grey
+      column:number <- copy left:number
+      row:number <- add row:number, 1:literal
+      move-cursor screen:address, row:number, column:number
+      # don't increment curr
+      loop +next-character:label
+    }
+    print-character screen:address, c:character
+    curr:address:duplex-list <- next-duplex curr:address:duplex-list
+    column:number <- add column:number, 1:literal
     loop
   }
-  move-cursor screen:address, top:number, left:number
+  move-cursor screen:address, cursor-row:number, cursor-column:number
+  reply row:number, screen:address/same-as-ingredient:1
+]
+
+scenario editor-initially-prints-multiple-lines [
+  assume-screen 5:literal/width, 3:literal/height
+  run [
+    s:address:array:character <- new [abc
+def]
+    new-editor s:address:array:character, screen:address, 0:literal/top, 0:literal/left, 5:literal/right
+  ]
+  screen-should-contain [
+    .abc  .
+    .def  .
+    .     .
+  ]
+]
+
+scenario editor-initially-handles-offsets [
+  assume-screen 5:literal/width, 3:literal/height
+  run [
+    s:address:array:character <- new [abc]
+    new-editor s:address:array:character, screen:address, 0:literal/top, 1:literal/left, 5:literal/right
+  ]
+  screen-should-contain [
+    . abc .
+    .     .
+    .     .
+  ]
+]
+
+scenario editor-initially-prints-multiple-lines-at-offset [
+  assume-screen 5:literal/width, 3:literal/height
+  run [
+    s:address:array:character <- new [abc
+def]
+    new-editor s:address:array:character, screen:address, 0:literal/top, 1:literal/left, 5:literal/right
+  ]
+  screen-should-contain [
+    . abc .
+    . def .
+    .     .
+  ]
 ]
 
-recipe draw-bounding-box [
+scenario editor-initially-wraps-long-lines [
+  assume-screen 5:literal/width, 3:literal/height
+  run [
+    s:address:array:character <- new [abc def]
+    new-editor s:address:array:character, screen:address, 0:literal/top, 0:literal/left, 5:literal/right
+  ]
+  screen-should-contain [
+    .abc ↩.
+    .def  .
+    .     .
+  ]
+  screen-should-contain-in-color, 245:literal/grey [
+    .    ↩.
+    .     .
+    .     .
+  ]
+]
+
+## handling events from the keyboard and mouse
+
+recipe event-loop [
   default-space:address:array:location <- new location:type, 30:literal
   screen:address <- next-ingredient
-  # sanity-check the box bounds
-  top:number <- next-ingredient
+  console:address <- next-ingredient
+  editor:address:editor-data <- next-ingredient
   {
-    out?:boolean <- lesser-than top:number, 0:literal
-    break-unless out?:boolean
-    top:number <- copy 0:literal
+    +next-event
+    e:event, console:address, found?:boolean, quit?:boolean <- read-event console:address
+    loop-unless found?:boolean
+    break-if quit?:boolean  # only in tests
+    trace [app], [next-event]
+    {
+      t:address:touch-event <- maybe-convert e:event, touch:variant
+      break-unless t:address:touch-event
+      editor:address:editor-data <- move-cursor-in-editor editor:address:editor-data, t:address:touch-event
+      loop +next-event:label
+    }
+    c:address:character <- maybe-convert e:event, text:variant
+    assert c:address:character, [event was of unknown type; neither keyboard nor mouse]
+    loop
   }
+]
+
+recipe move-cursor-in-editor [
+  default-space:address:array:location <- new location:type, 30:literal
+  editor:address:editor-data <- next-ingredient
+  t:address:touch-event <- next-ingredient
+  row:address:number <- get-address editor:address:editor-data/deref, cursor-row:offset
+  row:address:number/deref <- get t:address:touch-event/deref, row:offset
+  column:address:number <- get-address editor:address:editor-data/deref, cursor-column:offset
+  column:address:number/deref <- get t:address:touch-event/deref, column:offset
+  # todo: adjust 'cursor' pointer into editor data
+]
+
+scenario editor-handles-empty-event-queue [
+  assume-screen 10:literal/width, 5:literal/height
+  assume-console []
+  run [
+    s:address:array:character <- new [abc]
+    editor:address:editor-data <- new-editor s:address:array:character, screen:address, 0:literal/top, 0:literal/left, 5:literal/right
+    event-loop screen:address, console:address, editor:address:editor-data
+  ]
+  screen-should-contain [
+    .abc       .
+    .          .
+  ]
+]
+
+scenario editor-handles-mouse-clicks [
+  assume-screen 10:literal/width, 5:literal/height
+  assume-console [
+    left-click 0, 1
+  ]
+  run [
+    1:address:array:character <- new [abc]
+    2:address:editor-data <- new-editor 1:address:array:character, screen:address, 0:literal/top, 0:literal/left, 5:literal/right
+    event-loop screen:address, console:address, 2:address:editor-data
+    3:number <- get 2:address:editor-data/deref, cursor-row:offset
+    4:number <- get 2:address:editor-data/deref, cursor-column:offset
+  ]
+  screen-should-contain [
+    .abc       .
+    .          .
+  ]
+  memory-should-contain [
+    3 <- 0  # cursor is at row 0..
+    4 <- 1  # ..and column 1
+  ]
+]
+
+## helpers for drawing editor borders
+
+recipe draw-box [
+  default-space:address:array:location <- new location:type, 30:literal
+  screen:address <- next-ingredient
+  top:number <- next-ingredient
   left:number <- next-ingredient
-  {
-    out?:boolean <- lesser-than left:number, 0:literal
-    break-unless out?:boolean
-    left:number <- copy 0:literal
-  }
   bottom:number <- next-ingredient
-  {
-    height:number <- screen-height screen:address
-    out?:boolean <- greater-or-equal bottom:number, height:number
-    break-unless out?:boolean
-    bottom:number <- subtract height:number, 1:literal
-  }
   right:number <- next-ingredient
+  color:number, color-found?:boolean <- next-ingredient
   {
-    width:number <- screen-width screen:address
-    out?:boolean <- greater-or-equal right:number, width:number
-    break-unless out?:boolean
-    right:number <- subtract width:number, 1:literal
+    # default color to white
+    break-if color-found?:boolean
+    color:number <- copy 245:literal/grey
   }
-#?   print-integer screen:address, bottom:number
-#?   print-character screen:address, 32:literal/space
-#?   print-integer screen:address, right:number
   # top border
+  draw-horizontal screen:address, top:number, left:number, right:number, color:number
+  draw-horizontal screen:address, bottom:number, left:number, right:number, color:number
+  draw-vertical screen:address, left:number, top:number, bottom:number, color:number
+  draw-vertical screen:address, right:number, top:number, bottom:number, color:number
+  draw-top-left screen:address, top:number, left:number, color:number
+  draw-top-right screen:address, top:number, right:number, color:number
+  draw-bottom-left screen:address, bottom:number, left:number, color:number
+  draw-bottom-right screen:address, bottom:number, right:number, color:number
+  # position cursor inside box
   move-cursor screen:address, top:number, left:number
-  print-character screen:address, 9484:literal/down-right, 245:literal/grey
-  x:number <- add left:number, 1:literal  # exclude corner
+  cursor-down screen:address
+  cursor-right screen:address
+]
+
+recipe draw-horizontal [
+  default-space:address:array:location <- new location:type, 30:literal
+  screen:address <- next-ingredient
+  row:number <- next-ingredient
+  x:number <- next-ingredient
+  right:number <- next-ingredient
+  color:number, color-found?:boolean <- next-ingredient
   {
-    continue?:boolean <- lesser-than x:number, right:number
-    break-unless continue?:boolean
-    print-character screen:address, 9472:literal/horizontal, 245:literal/grey
-    x:number <- add x:number, 1:literal
-    loop
+    # default color to white
+    break-if color-found?:boolean
+    color:number <- copy 245:literal/grey
   }
-  print-character screen:address, 9488:literal/down-left, 245:literal/grey
-  # bottom border
-  move-cursor screen:address, bottom:number, left:number
-  print-character screen:address, 9492:literal/up-right, 245:literal/grey
-  x:number <- add left:number, 1:literal  # exclude corner
+  move-cursor screen:address, row:number, x:number
   {
     continue?:boolean <- lesser-than x:number, right:number
     break-unless continue?:boolean
-    print-character screen:address, 9472:literal/horizontal, 245:literal/grey
+    print-character screen:address, 9472:literal/horizontal, color:number
     x:number <- add x:number, 1:literal
     loop
   }
-  print-character screen:address, 9496:literal/up-left, 245:literal/grey
-  # left and right borders
-  x:number <- add top:number, 1:literal  # exclude corner
+]
+
+recipe draw-vertical [
+  default-space:address:array:location <- new location:type, 30:literal
+  screen:address <- next-ingredient
+  col:number <- next-ingredient
+  x:number <- next-ingredient
+  bottom:number <- next-ingredient
+  color:number, color-found?:boolean <- next-ingredient
+  {
+    # default color to white
+    break-if color-found?:boolean
+    color:number <- copy 245:literal/grey
+  }
   {
     continue?:boolean <- lesser-than x:number, bottom:number
     break-unless continue?:boolean
-    move-cursor screen:address, x:number, left:number
-    print-character screen:address, 9474:literal/vertical, 245:literal/grey
-    move-cursor screen:address, x:number, right:number
-    print-character screen:address, 9474:literal/vertical, 245:literal/grey
+    move-cursor screen:address, x:number, col:number
+    print-character screen:address, 9474:literal/vertical, color:number
     x:number <- add x:number, 1:literal
     loop
   }
-  # position cursor inside box
+]
+
+recipe draw-top-left [
+  default-space:address:array:location <- new location:type, 30:literal
+  screen:address <- next-ingredient
+  top:number <- next-ingredient
+  left:number <- next-ingredient
+  color:number, color-found?:boolean <- next-ingredient
+  {
+    # default color to white
+    break-if color-found?:boolean
+    color:number <- copy 245:literal/grey
+  }
   move-cursor screen:address, top:number, left:number
-  cursor-down screen:address
-  cursor-right screen:address
+  print-character screen:address, 9484:literal/down-right, color:number
+]
+
+recipe draw-top-right [
+  default-space:address:array:location <- new location:type, 30:literal
+  screen:address <- next-ingredient
+  top:number <- next-ingredient
+  right:number <- next-ingredient
+  color:number, color-found?:boolean <- next-ingredient
+  {
+    # default color to white
+    break-if color-found?:boolean
+    color:number <- copy 245:literal/grey
+  }
+  move-cursor screen:address, top:number, right:number
+  print-character screen:address, 9488:literal/down-left, color:number
+]
+
+recipe draw-bottom-left [
+  default-space:address:array:location <- new location:type, 30:literal
+  screen:address <- next-ingredient
+  bottom:number <- next-ingredient
+  left:number <- next-ingredient
+  color:number, color-found?:boolean <- next-ingredient
+  {
+    # default color to white
+    break-if color-found?:boolean
+    color:number <- copy 245:literal/grey
+  }
+  move-cursor screen:address, bottom:number, left:number
+  print-character screen:address, 9492:literal/up-right, color:number
+]
+
+recipe draw-bottom-right [
+  default-space:address:array:location <- new location:type, 30:literal
+  screen:address <- next-ingredient
+  bottom:number <- next-ingredient
+  right:number <- next-ingredient
+  color:number, color-found?:boolean <- next-ingredient
+  {
+    # default color to white
+    break-if color-found?:boolean
+    color:number <- copy 245:literal/grey
+  }
+  move-cursor screen:address, bottom:number, right:number
+  print-character screen:address, 9496:literal/up-left, color:number
 ]
diff --git a/html/factorial.mu.html b/html/factorial.mu.html index 22438340..13e4a6c0 100644 --- a/html/factorial.mu.html +++ b/html/factorial.mu.html @@ -12,13 +12,13 @@ diff --git a/html/fork.mu.html b/html/fork.mu.html index 40e645b5..4d6b367c 100644 --- a/html/fork.mu.html +++ b/html/fork.mu.html @@ -12,11 +12,11 @@ diff --git a/html/keyboard.mu.html b/html/keyboard.mu.html index 9b0e29b3..883ead79 100644 --- a/html/keyboard.mu.html +++ b/html/keyboard.mu.html @@ -12,12 +12,12 @@ diff --git a/html/mouse.mu.html b/html/mouse.mu.html index c4926f24..8987fca6 100644 --- a/html/mouse.mu.html +++ b/html/mouse.mu.html @@ -12,11 +12,11 @@ diff --git a/html/repl.mu.html b/html/repl.mu.html index 2ccd9f9b..87daf87b 100644 --- a/html/repl.mu.html +++ b/html/repl.mu.html @@ -12,14 +12,14 @@ @@ -36,35 +36,36 @@ body { font-family: monospace; color: #eeeeee; background-color: #080808; } recipe main [ default-space:address:array:location <- new location:type, 30:literal - switch-to-display + open-console msg:address:array:character <- new [ready! type in an instruction, then hit enter. ctrl-d exits. ] 0:literal/real-screen <- print-string 0:literal/real-screen, msg:address:array:character, 245:literal/grey - 0:literal/real-keyboard, 0:literal/real-screen <- color-session 0:literal/real-keyboard, 0:literal/real-screen -#? wait-for-key-from-keyboard #? 1 - return-to-console + 0:literal/real-console, 0:literal/real-screen <- color-session 0:literal/real-console, 0:literal/real-screen + close-console ] recipe color-session [ default-space:address:array:location <- new location:type, 30:literal - keyboard:address <- next-ingredient + console:address <- next-ingredient screen:address <- next-ingredient { - inst:address:array:character, keyboard:address, screen:address <- read-instruction keyboard:address, screen:address + inst:address:array:character, console:address, screen:address <- read-instruction console:address, screen:address break-unless inst:address:array:character run-interactive inst:address:array:character loop } - reply keyboard:address/same-as-ingredient:0, screen:address/same-as-ingredient:1 + reply console:address/same-as-ingredient:0, screen:address/same-as-ingredient:1 ] -# basic keyboard input; just text and enter +# basic console input; just text and enter scenario read-instruction1 [ assume-screen 30:literal/width, 5:literal/height - assume-keyboard [x <- copy y + assume-console [ + type [x <- copy y ] + ] run [ - 1:address:array:character <- read-instruction keyboard:address, screen:address + 1:address:array:character <- read-instruction console:address, screen:address 2:address:array:character <- new [=> ] print-string screen:address, 2:address:array:character print-string screen:address, 1:address:array:character @@ -85,15 +86,15 @@ body { font-family: monospace; color: #eeeeee; background-color: #080808; } ] ] -# Read characters as they're typed at the keyboard, print them to the screen, +# Read characters as they're typed at the console, print them to the screen, # accumulate them in a string, return the string at the end. # Most of the complexity is for the printing to screen, to highlight strings # and comments specially. Especially in the presence of backspacing. recipe read-instruction [ default-space:address:array:location <- new location:type, 60:literal - k:address:keyboard <- next-ingredient - x:address:screen <- next-ingredient - result:address:buffer <- init-buffer 10:literal # string to maybe add to + console:address <- next-ingredient + screen:address <- next-ingredient + result:address:buffer <- new-buffer 10:literal # string to maybe add to trace [app], [read-instruction] # start state machine by calling slurp-regular-characters, which will return # by calling the complete continuation @@ -104,7 +105,7 @@ body { font-family: monospace; color: #eeeeee; background-color: #080808; } completed?:boolean <- greater-than len:number, 0:literal jump-if completed?:boolean, +completed:label # Otherwise we're just getting started. - result:address:buffer, k:address:keyboard, x:address:screen <- slurp-regular-characters result:address:buffer, k:address:keyboard, x:address:screen, complete:continuation + result:address:buffer, console:address, screen:address <- slurp-regular-characters result:address:buffer, console:address, screen:address, complete:continuation #? $print [aaa: ], result:address:buffer #? 1 #? move-cursor-down-on-display #? 1 trace [error], [slurp-regular-characters should never return normally] @@ -113,16 +114,16 @@ body { font-family: monospace; color: #eeeeee; background-color: #080808; } #? $print [bbb: ], result2:address:array:character #? 1 #? move-cursor-down-on-display #? 1 trace [app], [exiting read-instruction] - reply result2:address:array:character, k:address:keyboard/same-as-ingredient:0, x:address:screen/same-as-ingredient:1 + reply result2:address:array:character, console:address/same-as-ingredient:0, screen:address/same-as-ingredient:1 ] -# read characters from the keyboard, print them to the screen in *white*. +# read characters from the console, print them to the screen in *white*. # Transition to other routines for comments and strings. recipe slurp-regular-characters [ default-space:address:array:location <- new location:type, 30:literal result:address:buffer <- next-ingredient - k:address:keyboard <- next-ingredient - x:address:screen <- next-ingredient + console:address <- next-ingredient + screen:address <- next-ingredient complete:continuation <- next-ingredient trace [app], [slurp-regular-characters] characters-slurped:number <- copy 0:literal @@ -134,8 +135,9 @@ body { font-family: monospace; color: #eeeeee; background-color: #080808; } #? ] #? 1 #? move-cursor-down-on-display #? 1 # read character - c:character, k:address:keyboard <- wait-for-key k:address:keyboard -#? print-character x:address:screen, c:character #? 1 + c:character, console:address found?:boolean <- read-key console:address + loop-unless found?:boolean +next-character:label +#? print-character screen:address, c:character #? 1 #? move-cursor-down-on-display #? 1 # quit? { @@ -146,21 +148,21 @@ body { font-family: monospace; color: #eeeeee; background-color: #080808; } #? $print [ctrl-d] #? 1 #? move-cursor-down-on-display #? 1 trace [app], [slurp-regular-characters: ctrl-d] - reply 0:literal, k:address:keyboard/same-as-ingredient:1, x:address:screen/same-as-ingredient:2 + reply 0:literal, console:address/same-as-ingredient:1, screen:address/same-as-ingredient:2 } { null?:boolean <- equal c:character, 0:literal/null break-unless null?:boolean trace [app], [slurp-regular-characters: null] - reply 0:literal, k:address:keyboard/same-as-ingredient:1, x:address:screen/same-as-ingredient:2 + reply 0:literal, console:address/same-as-ingredient:1, screen:address/same-as-ingredient:2 } # comment? { comment?:boolean <- equal c:character, 35:literal/hash break-unless comment?:boolean - print-character x:address:screen, c:character, 4:literal/blue + print-character screen:address, c:character, 4:literal/blue result:address:buffer <- buffer-append result:address:buffer, c:character - result:address:buffer, k:address:keyboard, x:address:screen <- slurp-comment result:address:buffer, k:address:keyboard, x:address:screen, complete:continuation + result:address:buffer, console:address, screen:address <- slurp-comment result:address:buffer, console:address, screen:address, complete:continuation # continue appending to this instruction, whether comment ended or was backspaced out of loop +next-character:label } @@ -168,23 +170,23 @@ body { font-family: monospace; color: #eeeeee; background-color: #080808; } { string?:boolean <- equal c:character, 91:literal/open-bracket break-unless string?:boolean - print-character x:address:screen, c:character, 6:literal/cyan + print-character screen:address, c:character, 6:literal/cyan result:address:buffer <- buffer-append result:address:buffer, c:character - result:address:buffer, _, k:address:keyboard, x:address:screen <- slurp-string result:address:buffer, k:address:keyboard, x:address:screen, complete:continuation + result:address:buffer, _, console:address, screen:address <- slurp-string result:address:buffer, console:address, screen:address, complete:continuation loop +next-character:label } # assignment { assign?:boolean <- equal c:character, 60:literal/less-than break-unless assign?:boolean - print-character x:address:screen, c:character, 1:literal/red + print-character screen:address, c:character, 1:literal/red trace [app], [start of assignment: <] result:address:buffer <- buffer-append result:address:buffer, c:character - result:address:buffer, k:address:keyboard, x:address:screen <- slurp-assignment result:address:buffer, k:address:keyboard, x:address:screen, complete:continuation + result:address:buffer, console:address, screen:address <- slurp-assignment result:address:buffer, console:address, screen:address, complete:continuation loop +next-character:label } # print - print-character x:address:screen, c:character # default color + print-character screen:address, c:character # default color # append result:address:buffer <- buffer-append result:address:buffer, c:character #? $print [a1 #? 1 @@ -214,7 +216,7 @@ body { font-family: monospace; color: #eeeeee; background-color: #080808; } #? $print [a6 #? 1 #? ] #? 1 #? move-cursor-down-on-display #? 1 - reply result:address:buffer, k:address:keyboard/same-as-ingredient:1, x:address:screen/same-as-ingredient:2 + reply result:address:buffer, console:address/same-as-ingredient:1, screen:address/same-as-ingredient:2 } loop +next-character:label } @@ -230,20 +232,20 @@ body { font-family: monospace; color: #eeeeee; background-color: #080808; } } # newline encountered; terminate all recursive calls #? xx:address:array:character <- new [completing!] #? 1 -#? print-string x:address:screen, xx:address:array:character #? 1 +#? print-string screen:address, xx:address:array:character #? 1 trace [app], [slurp-regular-characters: newline encountered; unwinding stack] continue-from complete:continuation ] -# read characters from keyboard, print them to screen in the comment color. +# read characters from console, print them to screen in the comment color. # # Simpler version of slurp-regular-characters; doesn't handle comments or # strings. Tracks an extra count in case we backspace out of it recipe slurp-comment [ default-space:address:array:location <- new location:type, 30:literal result:address:buffer <- next-ingredient - k:address:keyboard <- next-ingredient - x:address:screen <- next-ingredient + console:address <- next-ingredient + screen:address <- next-ingredient complete:continuation <- next-ingredient trace [app], [slurp-comment] # use this to track when backspace should reset color @@ -251,22 +253,23 @@ body { font-family: monospace; color: #eeeeee; background-color: #080808; } { +next-character # read character - c:character, k:address:keyboard <- wait-for-key k:address:keyboard + c:character, console:address, found?:boolean <- read-key console:address + loop-unless found?:boolean +next-character:label # quit? { ctrl-d?:boolean <- equal c:character, 4:literal/ctrl-d/eof break-unless ctrl-d?:boolean trace [app], [slurp-comment: ctrl-d] - reply 0:literal, k:address:keyboard/same-as-ingredient:1, x:address:screen/same-as-ingredient:2 + reply 0:literal, console:address/same-as-ingredient:1, screen:address/same-as-ingredient:2 } { null?:boolean <- equal c:character, 0:literal/null break-unless null?:boolean trace [app], [slurp-comment: null] - reply 0:literal, k:address:keyboard/same-as-ingredient:1, x:address:screen/same-as-ingredient:2 + reply 0:literal, console:address/same-as-ingredient:1, screen:address/same-as-ingredient:2 } # print - print-character x:address:screen, c:character, 4:literal/blue + print-character screen:address, c:character, 4:literal/blue # append result:address:buffer <- buffer-append result:address:buffer, c:character # backspace? decrement @@ -278,7 +281,7 @@ body { font-family: monospace; color: #eeeeee; background-color: #080808; } reset-color?:boolean <- lesser-or-equal characters-slurped:number, 0:literal break-unless reset-color?:boolean trace [app], [slurp-comment: too many backspaces; returning] - reply result:address:buffer, k:address:keyboard/same-as-ingredient:1, x:address:screen/same-as-ingredient:2 + reply result:address:buffer, console:address/same-as-ingredient:1, screen:address/same-as-ingredient:2 } loop +next-character:label } @@ -293,7 +296,7 @@ body { font-family: monospace; color: #eeeeee; background-color: #080808; } continue-from complete:continuation ] -# read characters from keyboard, print them to screen in the string color and +# read characters from console, print them to screen in the string color and # accumulate them into a buffer. # # Version of slurp-regular-characters that: @@ -303,8 +306,8 @@ body { font-family: monospace; color: #eeeeee; background-color: #080808; } recipe slurp-string [ default-space:address:array:location <- new location:type, 30:literal result:address:buffer <- next-ingredient - k:address:keyboard <- next-ingredient - x:address:screen <- next-ingredient + console:address <- next-ingredient + screen:address <- next-ingredient complete:continuation <- next-ingredient nested-string?:boolean <- next-ingredient trace [app], [slurp-string] @@ -313,35 +316,36 @@ body { font-family: monospace; color: #eeeeee; background-color: #080808; } { +next-character # read character - c:character, k:address:keyboard <- wait-for-key k:address:keyboard + c:character, console:address, found?:boolean <- read-key console:address + loop-unless found?:boolean +next-character:label # quit? { ctrl-d?:boolean <- equal c:character, 4:literal/ctrl-d/eof break-unless ctrl-d?:boolean trace [app], [slurp-string: ctrl-d] - reply 0:literal, 0:literal, k:address:keyboard/same-as-ingredient:1, x:address:screen/same-as-ingredient:2 + reply 0:literal, 0:literal, console:address/same-as-ingredient:1, screen:address/same-as-ingredient:2 } { null?:boolean <- equal c:character, 0:literal/null break-unless null?:boolean trace [app], [slurp-string: null] - reply 0:literal, 0:literal, k:address:keyboard/same-as-ingredient:1, x:address:screen/same-as-ingredient:2 + reply 0:literal, 0:literal, console:address/same-as-ingredient:1, screen:address/same-as-ingredient:2 } # string { string?:boolean <- equal c:character, 91:literal/open-bracket break-unless string?:boolean trace [app], [slurp-string: open-bracket encountered; recursing] - print-character x:address:screen, c:character, 6:literal/cyan + print-character screen:address, c:character, 6:literal/cyan result:address:buffer <- buffer-append result:address:buffer, c:character # make a recursive call to handle nested strings - result:address:buffer, tmp:number, k:address:keyboard, x:address:screen <- slurp-string result:address:buffer, k:address:keyboard, x:address:screen, complete:continuation, 1:literal/nested? + result:address:buffer, tmp:number, console:address, screen:address <- slurp-string result:address:buffer, console:address, screen:address, complete:continuation, 1:literal/nested? # but if we backspace over a completed nested string, handle it in the caller characters-slurped:number <- add characters-slurped:number, tmp:number, 1:literal # for the leading '[' loop +next-character:label } # print - print-character x:address:screen, c:character, 6:literal/cyan + print-character screen:address, c:character, 6:literal/cyan # append result:address:buffer <- buffer-append result:address:buffer, c:character # backspace? decrement @@ -353,7 +357,7 @@ body { font-family: monospace; color: #eeeeee; background-color: #080808; } reset-color?:boolean <- lesser-or-equal characters-slurped:number, 0:literal break-unless reset-color?:boolean trace [app], [slurp-string: too many backspaces; returning] - reply result:address:buffer/same-as-ingredient:0, 0:literal, k:address:keyboard/same-as-ingredient:1, x:address:screen/same-as-ingredient:2 + reply result:address:buffer/same-as-ingredient:0, 0:literal, console:address/same-as-ingredient:1, screen:address/same-as-ingredient:2 } loop +next-character:label } @@ -367,11 +371,11 @@ body { font-family: monospace; color: #eeeeee; background-color: #080808; } { break-unless nested-string?:boolean # nested string? return like a normal recipe - reply result:address:buffer, characters-slurped:number, k:address:keyboard, x:address:screen + reply result:address:buffer, characters-slurped:number, console:address, screen:address } # top-level string call? recurse trace [app], [slurp-string: close-bracket encountered; recursing to regular characters] - result:address:buffer, k:address:keyboard, x:address:screen <- slurp-regular-characters result:address:buffer, k:address:keyboard, x:address:screen, complete:continuation + result:address:buffer, console:address, screen:address <- slurp-regular-characters result:address:buffer, console:address, screen:address, complete:continuation # backspaced back into this string trace [app], [slurp-string: backspaced back into string; restarting] jump +next-character:label @@ -380,28 +384,29 @@ body { font-family: monospace; color: #eeeeee; background-color: #080808; } recipe slurp-assignment [ default-space:address:array:location <- new location:type, 30:literal result:address:buffer <- next-ingredient - k:address:keyboard <- next-ingredient - x:address:screen <- next-ingredient + console:address <- next-ingredient + screen:address <- next-ingredient complete:continuation <- next-ingredient { +next-character # read character - c:character, k:address:keyboard <- wait-for-key k:address:keyboard + c:character, console:address, found?:boolean <- read-key console:address + loop-unless found?:boolean +next-character:label # quit? { ctrl-d?:boolean <- equal c:character, 4:literal/ctrl-d/eof break-unless ctrl-d?:boolean trace [app], [slurp-assignment: ctrl-d] - reply 0:literal, k:address:keyboard/same-as-ingredient:1, x:address:screen/same-as-ingredient:2 + reply 0:literal, console:address/same-as-ingredient:1, screen:address/same-as-ingredient:2 } { null?:boolean <- equal c:character, 0:literal/null break-unless null?:boolean trace [app], [slurp-assignment: null] - reply 0:literal, k:address:keyboard/same-as-ingredient:1, x:address:screen/same-as-ingredient:2 + reply 0:literal, console:address/same-as-ingredient:1, screen:address/same-as-ingredient:2 } # print - print-character x:address:screen, c:character, 1:literal/red + print-character screen:address, c:character, 1:literal/red trace [app], [slurp-assignment: saved one character] # append result:address:buffer <- buffer-append result:address:buffer, c:character @@ -410,11 +415,11 @@ body { font-family: monospace; color: #eeeeee; background-color: #080808; } backspace?:boolean <- equal c:character, 8:literal/backspace break-unless backspace?:boolean trace [app], [slurp-assignment: backspace; returning] - reply result:address:buffer/same-as-ingredient:0, k:address:keyboard/same-as-ingredient:1, x:address:screen/same-as-ingredient:2 + reply result:address:buffer/same-as-ingredient:0, console:address/same-as-ingredient:1, screen:address/same-as-ingredient:2 } } trace [app], [slurp-assignment: done, recursing to regular characters] - result:address:buffer, k:address:keyboard, x:address:screen <- slurp-regular-characters result:address:buffer, k:address:keyboard, x:address:screen, complete:continuation + result:address:buffer, console:address, screen:address <- slurp-regular-characters result:address:buffer, console:address, screen:address, complete:continuation # backspaced back into this string trace [app], [slurp-assignment: backspaced back into assignment; restarting] jump +next-character:label @@ -422,10 +427,11 @@ body { font-family: monospace; color: #eeeeee; background-color: #080808; } scenario read-instruction-color-comment [ assume-screen 30:literal/width, 5:literal/height - assume-keyboard [# comment -] + assume-console [ + type [# comment] + ] run [ - read-instruction keyboard:address, screen:address + read-instruction console:address, screen:address ] screen-should-contain-in-color 4:literal/blue, [ .# comment . @@ -439,11 +445,13 @@ body { font-family: monospace; color: #eeeeee; background-color: #080808; } scenario read-instruction-cancel-comment-on-backspace [ assume-screen 30:literal/width, 5:literal/height - assume-keyboard [#a««z -] - replace-in-keyboard 171:literal/«, 8:literal/backspace + assume-console [ + type [#a««z] + ] + backspace:event <- merge 0:literal/text, 8:literal/backspace, 0:literal/dummy, 0:literal/dummy + replace-in-console 171:literal/«, backspace:event run [ - read-instruction keyboard:address, screen:address + read-instruction console:address, screen:address ] screen-should-contain-in-color 4:literal/blue, [ . . @@ -457,11 +465,13 @@ body { font-family: monospace; color: #eeeeee; background-color: #080808; } scenario read-instruction-cancel-comment-on-backspace2 [ assume-screen 30:literal/width, 5:literal/height - assume-keyboard [#ab«««z -] - replace-in-keyboard 171:literal/«, 8:literal/backspace + assume-console [ + type [#ab«««z] + ] + backspace:event <- merge 0:literal/text, 8:literal/backspace, 0:literal/dummy, 0:literal/dummy + replace-in-console 171:literal/«, backspace:event run [ - read-instruction keyboard:address, screen:address + read-instruction console:address, screen:address ] screen-should-contain-in-color 4:literal/blue, [ . . @@ -475,11 +485,13 @@ body { font-family: monospace; color: #eeeeee; background-color: #080808; } scenario read-instruction-cancel-comment-on-backspace3 [ assume-screen 30:literal/width, 5:literal/height - assume-keyboard [#a«z -] - replace-in-keyboard 171:literal/«, 8:literal/backspace + assume-console [ + type [#a«z] + ] + backspace:event <- merge 0:literal/text, 8:literal/backspace, 0:literal/dummy, 0:literal/dummy + replace-in-console 171:literal/«, backspace:event run [ - read-instruction keyboard:address, screen:address + read-instruction console:address, screen:address ] screen-should-contain-in-color 4:literal/blue, [ .#z . @@ -493,13 +505,13 @@ body { font-family: monospace; color: #eeeeee; background-color: #080808; } scenario read-instruction-stop-after-comment [ assume-screen 30:literal/width, 5:literal/height - # keyboard contains comment and then a second line - assume-keyboard [#abc -3 -] - replace-in-keyboard 171:literal/«, 8:literal/backspace + # console contains comment and then a second line + assume-console [ + type [#abc +3] + ] run [ - read-instruction keyboard:address, screen:address + read-instruction console:address, screen:address ] # check that read-instruction reads just the comment screen-should-contain [ @@ -511,10 +523,11 @@ body { font-family: monospace; color: #eeeeee; background-color: #080808; } scenario read-instruction-color-string [ #? $start-tracing #? 1 assume-screen 30:literal/width, 5:literal/height - assume-keyboard [abc [string] -] + assume-console [ + type [abc [string]] + ] run [ - read-instruction keyboard:address, screen:address + read-instruction console:address, screen:address ] screen-should-contain [ .abc [string] . @@ -532,11 +545,12 @@ body { font-family: monospace; color: #eeeeee; background-color: #080808; } scenario read-instruction-color-string-multiline [ assume-screen 30:literal/width, 5:literal/height - assume-keyboard [abc [line1 -line2] -] + assume-console [ + type [abc [line1 +line2]] + ] run [ - read-instruction keyboard:address, screen:address + read-instruction console:address, screen:address ] screen-should-contain [ .abc [line1 . @@ -557,10 +571,11 @@ body { font-family: monospace; color: #eeeeee; background-color: #080808; } scenario read-instruction-color-string-and-comment [ assume-screen 30:literal/width, 5:literal/height - assume-keyboard [abc [string] # comment -] + assume-console [ + type [abc [string] # comment] + ] run [ - read-instruction keyboard:address, screen:address + read-instruction console:address, screen:address ] screen-should-contain [ .abc [string] # comment . @@ -582,10 +597,11 @@ body { font-family: monospace; color: #eeeeee; background-color: #080808; } scenario read-instruction-ignore-comment-inside-string [ assume-screen 30:literal/width, 5:literal/height - assume-keyboard [abc [string # not a comment] -] + assume-console [ + type [abc [string # not a comment]] + ] run [ - read-instruction keyboard:address, screen:address + read-instruction console:address, screen:address ] screen-should-contain [ .abc [string # not a comment] . @@ -607,10 +623,11 @@ body { font-family: monospace; color: #eeeeee; background-color: #080808; } scenario read-instruction-ignore-string-inside-comment [ assume-screen 30:literal/width, 5:literal/height - assume-keyboard [abc # comment [not a string] -] + assume-console [ + type [abc # comment [not a string]] + ] run [ - read-instruction keyboard:address, screen:address + read-instruction console:address, screen:address ] screen-should-contain [ .abc # comment [not a string] . @@ -632,11 +649,12 @@ body { font-family: monospace; color: #eeeeee; background-color: #080808; } scenario read-instruction-color-string-inside-string [ assume-screen 30:literal/width, 5:literal/height - assume-keyboard [abc [string [inner string]] -] + assume-console [ + type [abc [string [inner string]]] + ] run [ #? $start-tracing #? 1 - read-instruction keyboard:address, screen:address + read-instruction console:address, screen:address #? $stop-tracing #? 1 #? $browse-trace #? 1 ] @@ -656,12 +674,19 @@ body { font-family: monospace; color: #eeeeee; background-color: #080808; } scenario read-instruction-cancel-string-on-backspace [ assume-screen 30:literal/width, 5:literal/height - # need to escape the '[' once for 'scenario' and once for 'assume-keyboard' - assume-keyboard [\\\[a««z -] - replace-in-keyboard 171:literal/«, 8:literal/backspace + assume-console [ + type [(a««z] # '(' is '[' and '«' is backspace + ] + open-bracket:event <- merge 0:literal/text, 91:literal/open-bracket, 0:literal/dummy, 0:literal/dummy + replace-in-console 40:literal/open-paren, open-bracket:event + backspace:event <- merge 0:literal/text, 8:literal/backspace, 0:literal/dummy, 0:literal/dummy + replace-in-console 171:literal/«, backspace:event run [ - read-instruction keyboard:address, screen:address +#? d:address:array:event <- get console:address/deref, data:offset #? 1 +#? $print [a: ], d:address:array:event #? 1 +#? x:number <- length d:address:array:event/deref #? 1 +#? $print [b: ], x:number #? 1 + read-instruction console:address, screen:address ] screen-should-contain-in-color 6:literal/cyan, [ . . @@ -675,11 +700,17 @@ body { font-family: monospace; color: #eeeeee; background-color: #080808; } scenario read-instruction-cancel-string-inside-string-on-backspace [ assume-screen 30:literal/width, 5:literal/height - assume-keyboard [[a[b]«««b] -] - replace-in-keyboard 171:literal/«, 8:literal/backspace + assume-console [ + type [(a[b]«««b)] # '(' is '[' and '«' is backspace + ] + open-bracket:event <- merge 0:literal/text, 91:literal/open-bracket, 0:literal/dummy, 0:literal/dummy + replace-in-console 40:literal/open-paren, open-bracket:event + close-bracket:event <- merge 0:literal/text, 93:literal/close-bracket, 0:literal/dummy, 0:literal/dummy + replace-in-console 41:literal/close-paren, close-bracket:event + backspace:event <- merge 0:literal/text, 8:literal/backspace, 0:literal/dummy, 0:literal/dummy + replace-in-console 171:literal/«, backspace:event run [ - read-instruction keyboard:address, screen:address + read-instruction console:address, screen:address ] screen-should-contain-in-color 6:literal/cyan, [ .[ab] . @@ -693,16 +724,19 @@ body { font-family: monospace; color: #eeeeee; background-color: #080808; } scenario read-instruction-backspace-back-into-string [ assume-screen 30:literal/width, 5:literal/height - assume-keyboard [[a]«b -] - replace-in-keyboard 171:literal/«, 8:literal/backspace + assume-console [ + type [[a]«b] # '«' is backspace + ] + backspace:event <- merge 0:literal/text, 8:literal/backspace, 0:literal/dummy, 0:literal/dummy + replace-in-console 171:literal/«, backspace:event run [ - read-instruction keyboard:address, screen:address + read-instruction console:address, screen:address ] screen-should-contain [ .\\\[ab . . . ] +#? $print [aaa] #? 1 screen-should-contain-in-color 6:literal/cyan, [ .\\\[ab . . . @@ -721,10 +755,11 @@ body { font-family: monospace; color: #eeeeee; background-color: #080808; } scenario read-instruction-highlight-start-of-assignment [ assume-screen 30:literal/width, 5:literal/height - assume-keyboard [a < -] + assume-console [ + type [a <] + ] run [ - read-instruction keyboard:address, screen:address + read-instruction console:address, screen:address ] screen-should-contain [ .a < . @@ -742,10 +777,11 @@ body { font-family: monospace; color: #eeeeee; background-color: #080808; } scenario read-instruction-highlight-assignment [ assume-screen 30:literal/width, 5:literal/height - assume-keyboard [a <- b -] + assume-console [ + type [a <- b] + ] run [ - read-instruction keyboard:address, screen:address + read-instruction console:address, screen:address ] screen-should-contain [ .a <- b . @@ -763,11 +799,13 @@ body { font-family: monospace; color: #eeeeee; background-color: #080808; } scenario read-instruction-backspace-over-assignment [ assume-screen 30:literal/width, 5:literal/height - assume-keyboard [a <-« -] - replace-in-keyboard 171:literal/«, 8:literal/backspace + assume-console [ + type [a <-«] # '«' is backspace + ] + backspace:event <- merge 0:literal/text, 8:literal/backspace, 0:literal/dummy, 0:literal/dummy + replace-in-console 171:literal/«, backspace:event run [ - read-instruction keyboard:address, screen:address + read-instruction console:address, screen:address ] screen-should-contain [ .a < . @@ -785,11 +823,14 @@ body { font-family: monospace; color: #eeeeee; background-color: #080808; } scenario read-instruction-assignment-continues-after-backspace [ assume-screen 30:literal/width, 5:literal/height - assume-keyboard [a <-«- -] - replace-in-keyboard 171:literal/«, 8:literal/backspace + assume-console [ + type [a <-«-] # '«' is backspace + ] + backspace:event <- merge 0:literal/text, 8:literal/backspace, 0:literal/dummy, 0:literal/dummy + replace-in-console 171:literal/«, backspace:event +#? $print [aaa] #? 1 run [ - read-instruction keyboard:address, screen:address + read-instruction console:address, screen:address ] screen-should-contain [ .a <- . @@ -807,11 +848,13 @@ body { font-family: monospace; color: #eeeeee; background-color: #080808; } scenario read-instruction-assignment-continues-after-backspace2 [ assume-screen 30:literal/width, 5:literal/height - assume-keyboard [a <- ««- -] - replace-in-keyboard 171:literal/«, 8:literal/backspace + assume-console [ + type [a <- ««-] # '«' is backspace + ] + backspace:event <- merge 0:literal/text, 8:literal/backspace, 0:literal/dummy, 0:literal/dummy + replace-in-console 171:literal/«, backspace:event run [ - read-instruction keyboard:address, screen:address + read-instruction console:address, screen:address #? $browse-trace #? 1 ] screen-should-contain [ diff --git a/html/screen.mu.html b/html/screen.mu.html index 9dfa3474..4618548a 100644 --- a/html/screen.mu.html +++ b/html/screen.mu.html @@ -12,9 +12,9 @@ @@ -34,26 +34,26 @@ body { font-family: monospace; color: #eeeeee; background-color: #080808; } # screens. recipe main [ - switch-to-display + open-console print-character 0:literal/screen, 97:literal, 2:literal/red 1:number/raw, 2:number/raw <- cursor-position 0:literal/screen - wait-for-key 0:literal/keyboard + wait-for-event 0:literal/console clear-screen 0:literal/screen move-cursor 0:literal/screen, 0:literal/row, 4:literal/column print-character 0:literal/screen, 98:literal - wait-for-key 0:literal/keyboard + wait-for-event 0:literal/console move-cursor 0:literal/screen, 0:literal/row, 0:literal/column clear-line 0:literal/screen - wait-for-key 0:literal/keyboard + wait-for-event 0:literal/console cursor-down 0:literal/screen - wait-for-key 0:literal/keyboard + wait-for-event 0:literal/console cursor-right 0:literal/screen - wait-for-key 0:literal/keyboard + wait-for-event 0:literal/console cursor-left 0:literal/screen - wait-for-key 0:literal/keyboard + wait-for-event 0:literal/console cursor-up 0:literal/screen - wait-for-key 0:literal/keyboard - return-to-console + wait-for-event 0:literal/console + close-console ] diff --git a/html/tangle.mu.html b/html/tangle.mu.html index 4337e012..77714d9f 100644 --- a/html/tangle.mu.html +++ b/html/tangle.mu.html @@ -12,12 +12,12 @@ diff --git a/html/x.mu.html b/html/x.mu.html index 8bde79bf..fa874a2d 100644 --- a/html/x.mu.html +++ b/html/x.mu.html @@ -12,9 +12,9 @@ -- cgit 1.4.1-2-gfad0