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

	Commit message (Collapse)	Author	Age	Files	Lines
*	1075	Kartik K. Agaram	2015-04-17	1	-1/+1
\|
*	1013	Kartik K. Agaram	2015-04-03	1	-2/+2
\|
*	1010	Kartik K. Agaram	2015-04-03	1	-2/+2
\|
*	997	Kartik K. Agaram	2015-03-30	1	-11/+11
\|
*	983 - arc 'integer-array' => c++ 'array:integer'	Kartik K. Agaram	2015-03-26	1	-1/+1
\|
*	968	Kartik K. Agaram	2015-03-24	1	-5/+5
\|
*	949 - paving the way for jumps to labels	Kartik K. Agaram	2015-03-17	1	-10/+10
\| \| \| \|	Addresses for reagents are now computed after all transforms.
*	941 - c++: basic break/loop conversion	Kartik K. Agaram	2015-03-16	1	-0/+6
\|
*	940 - c++: some changes to instruction model	Kartik K. Agaram	2015-03-16	1	-11/+11
\|
*	832 - call-stack for C++ version	Kartik K. Agaram	2015-02-25	1	-5/+5
\| \| \| \| \| \| \| \| \| \|	These #defines and references now span many different layers. Let's see if the lack of encapsulation causes problems. Also interesting to run into a case where I need to modify a foundational layer and touch every single scenario/trace. Only alternative was to duplicate all the different layers that add instructions. Sign of problems with this model?
*	823	Kartik K. Agaram	2015-02-22	1	-0/+36

<!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 - 027call_ingredient.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="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy="> <meta name="colorscheme" content="minimal"> <style type="text/css">  </style> <script type='text/javascript'>  </script> </head> <body onload='JumpToLine();'> <pre id='vimCodeElement'> 1 //: Calls can take ingredients just like primitives. To access a recipe's 2 //: ingredients, use 'next-ingredient'. 3 4 :(scenario next_ingredient) 5 def <a href='000organization.cc.html#L113'>main</a> [ 6 f 2 7 ] 8 def f [ 9 12:num <- next-ingredient 10 13:num <- add 1, 12:num 11 ] 12 +mem: storing 3 in location 13 13 14 :(scenario next_ingredient_missing) 15 def <a href='000organization.cc.html#L113'>main</a> [ 16 f 17 ] 18 def f [ 19 _, 12:num <- next-ingredient 20 ] 21 +mem: storing 0 in location 12 22 23 :(before "End call Fields") 24 vector<vector<double> > ingredient_atoms; 25 vector<reagent> ingredients; 26 int next_ingredient_to_process; 27 :(before "End call Constructor") 28 next_ingredient_to_process = 0; 29 30 :(before "End Call Housekeeping") 31 for (int i = 0; i < <a href='001help.cc.html#L141'>SIZE</a>(ingredients); ++i) { 32 <a href='026call.cc.html#L83'>current_call</a>().ingredient_atoms.push_back(ingredients.at(i)); 33 reagent/*copy*/ ingredient = call_instruction.ingredients.at(i); 34 // End Compute Call Ingredient 35 <a href='026call.cc.html#L83'>current_call</a>().ingredients.push_back(ingredient); 36 // End Populate Call Ingredient 37 } 38 39 :(before "End Primitive Recipe Declarations") 40 NEXT_INGREDIENT, 41 :(before "End Primitive Recipe Numbers") 42 <a href='001help.cc.html#L221'>put</a>(Recipe_ordinal, "next-ingredient", NEXT_INGREDIENT); 43 <a href='001help.cc.html#L221'>put</a>(Recipe_ordinal, "next-input", NEXT_INGREDIENT); 44 :(before "End Primitive Recipe Checks") 45 case NEXT_INGREDIENT: { 46 if (!inst.ingredients.empty()) { 47 <a href='003trace.cc.html#L174'>raise</a> << <a href='013update_operation.cc.html#L25'>maybe</a>(get(Recipe, r).name) << "'next-ingredient' didn't expect any ingredients in '" << to_original_string(inst) << "'\n" << end(); 48 break; 49 } 50 break; 51 } 52 :(before "End Primitive Recipe Implementations") 53 case NEXT_INGREDIENT: { 54 assert(!Current_routine->calls.empty()); 55 if (<a href='026call.cc.html#L83'>current_call</a>().next_ingredient_to_process < <a href='001help.cc.html#L141'>SIZE</a>(<a href='026call.cc.html#L83'>current_call</a>().ingredient_atoms)) { 56 reagent/*copy*/ product = <a href='026call.cc.html#L89'>current_instruction</a>().products.at(0); 57 // End Preprocess NEXT_INGREDIENT product 58 if (<a href='026call.cc.html#L87'>current_recipe_name</a>() == "main") { 59 // no ingredient types since the call might be implicit; assume ingredients are always strings 60 // todo: how to test this? 61 if (!is_mu_text(product)) 62 <a href='003trace.cc.html#L174'>raise</a> << "main: wrong type for ingredient '" << product.original_string << "'\n" << <a href='003trace.cc.html#L203'>end</a>(); 63 } 64 else if (!types_coercible(product, 65 <a href='026call.cc.html#L83'>current_call</a>().ingredients.at(<a href='026call.cc.html#L83'>current_call</a>().next_ingredient_to_process))) { 66 <a href='003trace.cc.html#L174'>raise</a> << <a href='013update_operation.cc.html#L25'>maybe</a>(<a href='026call.cc.html#L87'>current_recipe_name</a>()) << "wrong type for ingredient '" << product.original_string << "': " << <a href='026call.cc.html#L83'>current_call</a>().ingredients.at(<a href='026call.cc.html#L83'>current_call</a>().next_ingredient_to_process).original_string << '\n' << <a href='003trace.cc.html#L203'>end</a>(); 67 // End next-ingredient Type Mismatch Error 68 } 69 products.push_back( 70 <a href='026call.cc.html#L83'>current_call</a>().ingredient_atoms.at(<a href='026call.cc.html#L83'>current_call</a>().next_ingredient_to_process)); 71 assert(<a href='001help.cc.html#L141'>SIZE</a>(products) == 1); products.resize(2); // push a new vector 72 products.at(1).push_back(1); 73 ++current_call().next_ingredient_to_process; 74 } 75 else { 76 if (<a href='001help.cc.html#L141'>SIZE</a>(<a href='026call.cc.html#L89'>current_instruction</a>().products) < 2) 77 <a href='003trace.cc.html#L174'>raise</a> << <a href='013update_operation.cc.html#L25'>maybe</a>(<a href='026call.cc.html#L87'>current_recipe_name</a>()) << "no ingredient to save in '" << current_instruction().products.at(0).original_string << "'\n" << <a href='003trace.cc.html#L203'>end</a>(); 78 if (<a href='026call.cc.html#L89'>current_instruction</a>().products.empty()) break; 79 products.resize(2); 80 // pad the first product with sufficient zeros to match its type 81 products.at(0).resize(size_of(<a href='026call.cc.html#L89'>current_instruction</a>().products.at(0))); 82 products.at(1).push_back(0); 83 } 84 break; 85 } 86 87 :(scenario next_ingredient_fail_on_missing) 88 % Hide_errors = true; 89 def <a href='000organization.cc.html#L113'>main</a> [ 90 f 91 ] 92 def f [ 93 11:num <- next-ingredient 94 ] 95 +error: f: no ingredient to save in '11:num' 96 97 :(scenario rewind_ingredients) 98 def <a href='000organization.cc.html#L113'>main</a> [ 99 f 2 100 ] 101 def f [ 102 12:num <- next-ingredient # consume ingredient 103 _, 1:bool <- next-ingredient # will not find any ingredients 104 rewind-ingredients 105 13:num, 2:bool <- next-ingredient # will find ingredient again 106 ] 107 +mem: storing 2 in location 12 108 +mem: storing 0 in location 1 109 +mem: storing 2 in location 13 110 +mem: storing 1 in location 2 111 112 :(before "End Primitive Recipe Declarations") 113 REWIND_INGREDIENTS, 114 :(before "End Primitive Recipe Numbers") 115 <a href='001help.cc.html#L221'>put</a>(Recipe_ordinal, "rewind-ingredients", REWIND_INGREDIENTS); 116 <a href='001help.cc.html#L221'>put</a>(Recipe_ordinal, "rewind-inputs", REWIND_INGREDIENTS); 117 :(before "End Primitive Recipe Checks") 118 case REWIND_INGREDIENTS: { 119 break; 120 } 121 :(before "End Primitive Recipe Implementations") 122 case REWIND_INGREDIENTS: { 123 <a href='026call.cc.html#L83'>current_call</a>().next_ingredient_to_process = 0; 124 break; 125 } 126 127 :(scenario ingredient) 128 def <a href='000organization.cc.html#L113'>main</a> [ 129 f 1, 2 130 ] 131 def f [ 132 12:num <- ingredient 1 # consume second ingredient first 133 13:num, 1:bool <- next-ingredient # next-ingredient tries to scan past that 134 ] 135 +mem: storing 2 in location 12 136 +mem: storing 0 in location 1 137 138 :(before "End Primitive Recipe Declarations") 139 INGREDIENT, 140 :(before "End Primitive Recipe Numbers") 141 <a href='001help.cc.html#L221'>put</a>(Recipe_ordinal, "ingredient", INGREDIENT); 142 <a href='001help.cc.html#L221'>put</a>(Recipe_ordinal, "input", INGREDIENT); 143 :(before "End Primitive Recipe Checks") 144 case INGREDIENT: { 145 if (<a href='001help.cc.html#L141'>SIZE</a>(inst.ingredients) != 1) { 146 <a href='003trace.cc.html#L174'>raise</a> << <a href='013update_operation.cc.html#L25'>maybe</a>(get(Recipe, r).name) << "'ingredient' expects exactly one ingredient, but got '" << to_original_string(inst) << "'\n" << <a href='003trace.cc.html#L203'>end</a>(); 147 break; 148 } 149 if (!is_literal(inst.ingredients.at(0)) && !is_mu_number(inst.ingredients.at(0))) { 150 <a href='003trace.cc.html#L174'>raise</a> << <a href='013update_operation.cc.html#L25'>maybe</a>(get(Recipe, r).name) << "'ingredient' expects a literal ingredient, but got '" << inst.ingredients.at(0).original_string << "'\n" << <a href='003trace.cc.html#L203'>end</a>(); 151 break; 152 } 153 break; 154 } 155 :(before "End Primitive Recipe Implementations") 156 case INGREDIENT: { 157 if (static_cast<int>(ingredients.at(0).at(0)) < <a href='001help.cc.html#L141'>SIZE</a>(<a href='026call.cc.html#L83'>current_call</a>().ingredient_atoms)) { 158 <a href='026call.cc.html#L83'>current_call</a>().next_ingredient_to_process = ingredients.at(0).at(0); 159 products.push_back( 160 <a href='026call.cc.html#L83'>current_call</a>().ingredient_atoms.at(<a href='026call.cc.html#L83'>current_call</a>().next_ingredient_to_process)); 161 assert(<a href='001help.cc.html#L141'>SIZE</a>(products) == 1); products.resize(2); // push a new vector 162 products.at(1).push_back(1); 163 ++current_call().next_ingredient_to_process; 164 } 165 else { 166 if (<a href='001help.cc.html#L141'>SIZE</a>(<a href='026call.cc.html#L89'>current_instruction</a>().products) > 1) { 167 products.resize(2); 168 products.at(0).push_back(0); // todo: will fail noisily if we try to read a compound value 169 products.at(1).push_back(0); 170 } 171 } 172 break; 173 } 174 175 //: a particularly common array type is the text, or address:array:character 176 :(code) 177 bool <a href='027call_ingredient.cc.html#L177'>is_mu_text</a>(reagent/*copy*/ x) { 178 // End Preprocess is_mu_text(reagent x) 179 return x.type 180 && !x.type->atom 181 && x.type->left->atom 182 && x.type->left->value == Address_type_ordinal 183 && x.type->right 184 && !x.type->right->atom 185 && x.type->right->left->atom 186 && x.type->right->left->value == Array_type_ordinal 187 && x.type->right->right 188 && !x.type->right->right->atom 189 && x.type->right->right->left->value == Character_type_ordinal 190 && x.type->right->right->right == NULL; 191 } </pre> </body> </html>