mu - Soul of a tiny new machine. More thorough tests → More comprehensible and rewrite-friendly software → More resilient society.

	Commit message (Expand)	Author	Age	Files	Lines
*	5001 - drop the :(scenario) DSL	Kartik Agaram	2019-03-12	1	-72/+78
*	4987 - support `browse_trace` tool in SubX	Kartik Agaram	2019-02-25	1	-7/+7
*	4266 - space for alloc-id in heap allocations	Kartik Agaram	2018-06-24	1	-6/+6
*	4258 - undo 4257	Kartik Agaram	2018-06-15	1	-6/+6
*	4257 - abortive attempt at safe fat pointers	Kartik Agaram	2018-06-15	1	-6/+6
*	4179 - experiment: rip out memory reclamation	Kartik K. Agaram	2018-01-03	1	-10/+6
*	4106	Kartik K. Agaram	2017-11-03	1	-1/+1
*	4104	Kartik K. Agaram	2017-11-03	1	-7/+7
*	3894 - comment/uncomment lines in edit app	Kartik K. Agaram	2017-05-29	1	-0/+1
*	3643	Kartik K. Agaram	2016-11-07	1	-1/+1
*	3565	Kartik K. Agaram	2016-10-23	1	-4/+4
*	3522	Kartik K. Agaram	2016-10-19	1	-5/+5
*	3503	Kartik K. Agaram	2016-10-15	1	-2/+2
*	3502	Kartik K. Agaram	2016-10-15	1	-5/+2
*	3500	Kartik K. Agaram	2016-10-15	1	-2/+2
*	3445	Kartik K. Agaram	2016-10-06	1	-10/+27
*	3389	Kartik K. Agaram	2016-09-17	1	-10/+10
*	3381	Kartik K. Agaram	2016-09-17	1	-4/+4
*	3379	Kartik K. Agaram	2016-09-17	1	-4/+4
*	3273	Kartik K. Agaram	2016-08-28	1	-2/+2
*	3272	Kartik K. Agaram	2016-08-28	1	-1/+1
*	3260	Kartik K. Agaram	2016-08-26	1	-2/+2
*	3259	Kartik K. Agaram	2016-08-26	1	-1/+1
*	3241	Kartik K. Agaram	2016-08-21	1	-29/+26
*	3240	Kartik K. Agaram	2016-08-21	1	-8/+8
*	3239	Kartik K. Agaram	2016-08-21	1	-4/+4
*	3229 - fake file systems using 'assume-filesystem'	Kartik K. Agaram	2016-08-20	1	-2/+2
*	3178	Kartik K. Agaram	2016-08-13	1	-0/+4
*	3083	Kartik K. Agaram	2016-07-01	1	-2/+2
*	2990	Kartik K. Agaram	2016-05-20	1	-1/+1
*	2973 - reclaim refcounts for local scopes again	Kartik K. Agaram	2016-05-18	1	-0/+2
*	2864 - replace all address:shared with just address	Kartik K. Agaram	2016-04-24	1	-10/+10
*	2773 - switch to 'int'	Kartik K. Agaram	2016-03-13	1	-21/+21
*	2771 - fix for clang on 32-bit machines	Kartik K. Agaram	2016-03-13	1	-1/+1
*	2767 - reclaim refcounts for local variables	Kartik K. Agaram	2016-03-12	1	-0/+2
*	2712	Kartik K. Agaram	2016-02-26	1	-2/+2
*	2677	Kartik K. Agaram	2016-02-20	1	-2/+2
*	2581 - make space for the refcount in address:shared	Kartik K. Agaram	2016-01-20	1	-5/+13
*	2576 - distinguish allocated addresses from others	Kartik K. Agaram	2016-01-19	1	-10/+10
*	2430 - make room for more transforms	Kartik K. Agaram	2015-11-13	1	-0/+287

<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> <html> <head> <meta http-equiv="content-type" content="text/html; charset=UTF-8"> <title>Mu - 011load.cc</title> <meta name="Generator" content="Vim/7.4"> <meta name="plugin-version" content="vim7.4_v2"> <meta name="syntax" content="cpp"> <meta name="settings" content="use_css,pre_wrap,no_foldcolumn,expand_tabs,prevent_copy="> <meta name="colorscheme" content="minimal"> <style type="text/css">  </style> <script type='text/javascript'>  </script> </head> <body> <pre id='vimCodeElement'> //: Phase 1 of running mu code: load it from a textual representation. :(scenarios load) // use 'load' instead of 'run' in all scenarios in this layer :(scenario first_recipe) def main [ 1:number <- copy 23 ] +parse: instruction: copy +parse: ingredient: {23: "literal"} +parse: product: {1: "number"} :(code) vector<recipe_ordinal> load(string form) { istringstream in(form); in >> std::noskipws; return load(in); } vector<recipe_ordinal> load(istream& in) { in >> std::noskipws; vector<recipe_ordinal> result; while (has_data(in)) { skip_whitespace_and_comments(in); if (!has_data(in)) break; string command = next_word(in); // Command Handlers if (command == "recipe" || command == "def") { recipe_ordinal r = slurp_recipe(in); if (r > 0) result.push_back(r); } else if (command == "recipe!" || command == "def!") { Disable_redefine_checks = true; recipe_ordinal r = slurp_recipe(in); if (r > 0) result.push_back(r); Disable_redefine_checks = false; } // End Command Handlers else { raise << "unknown top-level command: " << command << '\n' << end(); } } return result; } // return the recipe ordinal slurped, or -1 if it failed // (later layers will cause failures) int slurp_recipe(istream& in) { recipe result; result.name = next_word(in); // End Load Recipe Name skip_whitespace_but_not_newline(in); // End Recipe Refinements if (result.name.empty()) raise << "empty result.name\n" << end(); trace(9991, "parse") << "--- defining " << result.name << end(); if (!contains_key(Recipe_ordinal, result.name)) put(Recipe_ordinal, result.name, Next_recipe_ordinal++); if (Recipe.find(get(Recipe_ordinal, result.name)) != Recipe.end()) { trace(9991, "parse") << "already exists" << end(); if (should_check_for_redefine(result.name)) raise << "redefining recipe " << result.name << "\n" << end(); Recipe.erase(get(Recipe_ordinal, result.name)); } slurp_body(in, result); // End Recipe Body(result) put(Recipe, get(Recipe_ordinal, result.name), result); return get(Recipe_ordinal, result.name); } void slurp_body(istream& in, recipe& result) { in >> std::noskipws; skip_whitespace_but_not_newline(in); if (in.get() != '[') raise << result.name << ": recipe body must begin with '['\n" << end(); skip_whitespace_and_comments(in); // permit trailing comment after '[' instruction curr; while (next_instruction(in, &curr)) { curr.original_string = to_original_string(curr); // End Rewrite Instruction(curr, recipe result) trace(9992, "load") << "after rewriting: " << to_string(curr) << end(); if (!curr.is_empty()) result.steps.push_back(curr); } } bool next_instruction(istream& in, instruction* curr) { curr->clear(); skip_whitespace_and_comments(in); if (!has_data(in)) { raise << "0: unbalanced '[' for recipe\n" << end(); return false; } vector<string> words; while (has_data(in) && in.peek() != '\n') { skip_whitespace_but_not_newline(in); if (!has_data(in)) { raise << "1: unbalanced '[' for recipe\n" << end(); return false; } string word = next_word(in); words.push_back(word); skip_whitespace_but_not_newline(in); } skip_whitespace_and_comments(in); if (SIZE(words) == 1 && words.at(0) == "]") return false; // end of recipe if (SIZE(words) == 1 && !isalnum(words.at(0).at(0)) && words.at(0).at(0) != '$') { curr->is_label = true; curr->label = words.at(0); trace(9993, "parse") << "label: " << curr->label << end(); if (!has_data(in)) { raise << "7: unbalanced '[' for recipe\n" << end(); return false; } return true; } vector<string>::iterator p = words.begin(); if (find(words.begin(), words.end(), "<-") != words.end()) { for (; *p != "<-"; ++p) curr->products.push_back(reagent(*p)); ++p; // skip <- } if (p == words.end()) { raise << "instruction prematurely ended with '<-'\n" << end(); return false; } curr->old_name = curr->name = *p; ++p; // curr->operation will be set in a later layer for (; p != words.end(); ++p) curr->ingredients.push_back(reagent(*p)); trace(9993, "parse") << "instruction: " << curr->name << end(); trace(9993, "parse") << " number of ingredients: " << SIZE(curr->ingredients) << end(); for (vector<reagent>::iterator p = curr->ingredients.begin(); p != curr->ingredients.end(); ++p) trace(9993, "parse") << " ingredient: " << to_string(*p) << end(); for (vector<reagent>::iterator p = curr->products.begin(); p != curr->products.end(); ++p) trace(9993, "parse") << " product: " << to_string(*p) << end(); if (!has_data(in)) { raise << "9: unbalanced '[' for recipe\n" << end(); return false; } return true; } string next_word(istream& in) { skip_whitespace_but_not_newline(in); // End next_word Special-cases ostringstream out; slurp_word(in, out); skip_whitespace_and_comments_but_not_newline(in); return out.str(); } :(before "End Globals") // word boundaries const string Terminators("(){}"); :(code) void slurp_word(istream& in, ostream& out) { char c; if (has_data(in) && Terminators.find(in.peek()) != string::npos) { in >> c; out << c; return; } while (in >> c) { if (isspace(c) || Terminators.find(c) != string::npos || Ignore.find(c) != string::npos) { in.putback(c); break; } out << c; } } void skip_whitespace_and_comments(istream& in) { while (true) { if (!has_data(in)) break; if (isspace(in.peek())) in.get(); else if (Ignore.find(in.peek()) != string::npos) in.get(); else if (in.peek() == '#') skip_comment(in); else break; } } // confusing; move to the next line only to skip a comment, but never otherwise void skip_whitespace_and_comments_but_not_newline(istream& in) { while (true) { if (!has_data(in)) break; if (in.peek() == '\n') break; if (isspace(in.peek())) in.get(); else if (Ignore.find(in.peek()) != string::npos) in.get(); else if (in.peek() == '#') skip_comment(in); else break; } } void skip_comment(istream& in) { if (has_data(in) && in.peek() == '#') { in.get(); while (has_data(in) && in.peek() != '\n') in.get(); } } //: Warn if a recipe gets redefined, because large codebases can accidentally //: step on their own toes. But there'll be many occasions later where //: we'll want to disable the errors. :(before "End Globals") bool Disable_redefine_checks = false; :(before "End Setup") Disable_redefine_checks = false; :(code) bool should_check_for_redefine(const string& recipe_name) { if (Disable_redefine_checks) return false; return true; } // for debugging :(code) void show_rest_of_stream(istream& in) { cerr << '^'; char c; while (in >> c) cerr << c; cerr << "$\n"; exit(0); } :(scenario parse_comment_outside_recipe) # this comment will be dropped by the tangler, so we need a dummy recipe to stop that def f1 [ ] # this comment will go through to 'load' def main [ 1:number <- copy 23 ] +parse: instruction: copy +parse: ingredient: {23: "literal"} +parse: product: {1: "number"} :(scenario parse_comment_amongst_instruction) def main [ # comment 1:number <- copy 23 ] +parse: instruction: copy +parse: ingredient: {23: "literal"} +parse: product: {1: "number"} :(scenario parse_comment_amongst_instruction_2) def main [ # comment 1:number <- copy 23 # comment ] +parse: instruction: copy +parse: ingredient: {23: "literal"} +parse: product: {1: "number"} :(scenario parse_comment_amongst_instruction_3) def main [ 1:number <- copy 23 # comment 2:number <- copy 23 ] +parse: instruction: copy +parse: ingredient: {23: "literal"} +parse: product: {1: "number"} +parse: instruction: copy +parse: ingredient: {23: "literal"} +parse: product: {2: "number"} :(scenario parse_comment_after_instruction) def main [ 1:number <- copy 23 # comment ] +parse: instruction: copy +parse: ingredient: {23: "literal"} +parse: product: {1: "number"} :(scenario parse_label) def main [ +foo ] +parse: label: +foo :(scenario parse_dollar_as_recipe_name) def main [ $foo ] +parse: instruction: $foo :(scenario parse_multiple_properties) def main [ 1:number <- copy 23/foo:bar:baz ] +parse: instruction: copy +parse: ingredient: {23: "literal", "foo": ("bar" "baz")} +parse: product: {1: "number"} :(scenario parse_multiple_products) def main [ 1:number, 2:number <- copy 23 ] +parse: instruction: copy +parse: ingredient: {23: "literal"} +parse: product: {1: "number"} +parse: product: {2: "number"} :(scenario parse_multiple_ingredients) def main [ 1:number, 2:number <- copy 23, 4:number ] +parse: instruction: copy +parse: ingredient: {23: "literal"} +parse: ingredient: {4: "number"} +parse: product: {1: "number"} +parse: product: {2: "number"} :(scenario parse_multiple_types) def main [ 1:number, 2:address:number <- copy 23, 4:number ] +parse: instruction: copy +parse: ingredient: {23: "literal"} +parse: ingredient: {4: "number"} +parse: product: {1: "number"} +parse: product: {2: ("address" "number")} :(scenario parse_properties) def main [ 1:address:number/lookup <- copy 23 ] +parse: product: {1: ("address" "number"), "lookup": ()} //: this test we can't represent with a scenario :(code) void test_parse_comment_terminated_by_eof() { load("recipe main [\n" " a:number <- copy 34\n" "]\n" "# abc"); // no newline after comment cerr << "."; // termination = success } :(scenario forbid_redefining_recipes) % Hide_errors = true; def main [ 1:number <- copy 23 ] def main [ 1:number <- copy 24 ] +error: redefining recipe main :(scenario permit_forcibly_redefining_recipes) def main [ 1:number <- copy 23 ] def! main [ 1:number <- copy 24 ] -error: redefining recipe main $error: 0 </pre> </body> </html>