Merge branch 'master' into openpgp - profani-tty - Profanity fork with TTY improvements

diff options

author	James Booth <boothj5@gmail.com>	2015-06-14 00:04:11 +0100
committer	James Booth <boothj5@gmail.com>	2015-06-14 00:04:11 +0100
commit	b52de6869a2d22426eb77ae62c17514fb8520308 (patch)
tree	4331ee0d1d38604cd56066545d455da9e136cec5 /.travis.yml
parent	10a5f29023b5ace2358b57da86038de4a5d47f5f (diff)
parent	0623ed71dd3e8232b4e8ccc7e561764217d3a8c4 (diff)
download	profani-tty-b52de6869a2d22426eb77ae62c17514fb8520308.tar.gz

Merge branch 'master' into openpgp

Diffstat (limited to '.travis.yml')

-rw-r--r--

.travis.yml

1 files changed, 0 insertions, 1 deletions

//: Go from an address to the payload it points at using /lookup. //: //: The tests in this layer use unsafe operations so as to stay decoupled from //: 'new'. :(scenario copy_indirect) def main [ 1:address:num <- copy 10/unsafe 10:num <- copy 34 # This loads location 1 as an address and looks up *that* location. 2:num <- copy 1:address:num/lookup ] +mem: storing 34 in location 2 :(before "End Preprocess read_memory(x)") canonize(x); //: similarly, write to addresses pointing at other locations using the //: 'lookup' property :(scenario store_indirect) def main [ 1:address:num <- copy 10/unsafe 1:address:num/lookup <- copy 34 ] +mem: storing 34 in location 10 :(before "End Preprocess write_memory(x, data)") canonize(x); //: writes to address 0 always loudly fail :(scenario store_to_0_fails) % Hide_errors = true; def main [ 1:address:num <- copy null 1:address:num/lookup <- copy 34 ] -mem: storing 34 in location 0 +error: can't write to location 0 in '1:address:num/lookup <- copy 34' //: attempts to /lookup address 0 always loudly fail :(scenario lookup_0_fails) % Hide_errors = true; def main [ 1:address:num <- copy null 2:num <- copy 1:address:num/lookup ] +error: main: tried to lookup 0 in '2:num <- copy 1:address:num/lookup' :(scenario lookup_0_dumps_callstack) % Hide_errors = true; def main [ foo null ] def foo [ 1:address:num <- next-input 2:num <- copy 1:address:num/lookup ] +error: foo: tried to lookup 0 in '2:num <- copy 1:address:num/lookup' +error: called from main: foo null :(code) void canonize(reagent& x) { if (is_literal(x)) return; // Begin canonize(x) Lookups while (has_property(x, "lookup")) lookup_memory(x); } void lookup_memory(reagent& x) { if (!x.type || x.type->atom || x.type->left->value != Address_type_ordinal) { raise << maybe(current_recipe_name()) << "tried to lookup '" << x.original_string << "' but it isn't an address\n" << end(); dump_callstack(); return; } // compute value if (x.value == 0) { raise << maybe(current_recipe_name()) << "tried to lookup 0\n" << end(); dump_callstack(); return; } lookup_memory_core(x, /*check_for_null*/true); } void lookup_memory_core(reagent& x, bool check_for_null) { double address = x.value; double new_value = get_or_insert(Memory, address); trace("mem") << "location " << address << " contains " << no_scientific(new_value) << end(); if (check_for_null && new_value == 0) { if (Current_routine) { raise << maybe(current_recipe_name()) << "tried to lookup 0 in '" << to_original_string(current_instruction()) << "'\n" << end(); dump_callstack(); } else { raise << "tried to lookup 0\n" << end(); } } x.set_value(new_value); drop_from_type(x, "address"); drop_one_lookup(x); } :(before "End Preprocess types_strictly_match(reagent to, reagent from)") if (!canonize_type(to)) return false; if (!canonize_type(from)) return false; :(before "End Preprocess is_mu_array(reagent r)") if (!canonize_type(r)) return false; :(before "End Preprocess is_mu_address(reagent r)") if (!canonize_type(r)) return false; :(before "End Preprocess is_mu_number(reagent r)") if (!canonize_type(r)) return false; :(before "End Preprocess is_mu_boolean(reagent r)") if (!canonize_type(r)) return false; :(before "End Preprocess is_mu_character(reagent r)") if (!canonize_type(r)) return false; :(after "Update product While Type-checking Merge") if (!canonize_type(product)) continue; :(before "End Compute Call Ingredient") canonize_type(ingredient); :(before "End Preprocess NEXT_INGREDIENT product") canonize_type(product); :(before "End Check RETURN Copy(lhs, rhs) canonize_type(lhs); canonize_type(rhs); :(code) bool canonize_type(reagent& r) { while (has_property(r, "lookup")) { if (!r.type || r.type->atom || !r.type->left || !r.type->left->atom || r.type->left->value != Address_type_ordinal) { raise << "cannot perform lookup on '" << r.name << "' because it has non-address type " << to_string(r.type) << '\n' << end(); return false; } drop_from_type(r, "address"); drop_one_lookup(r); } return true; } void drop_one_lookup(reagent& r) { for (vector<pair<string, string_tree*> >::iterator p = r.properties.begin(); p != r.properties.end(); ++p) { if (p->first == "lookup") { r.properties.erase(p); return; } } assert(false); } //: Tedious fixup to support addresses in container/array instructions of previous layers. //: Most instructions don't require fixup if they use the 'ingredients' and //: 'products' variables in run_current_routine(). :(scenario get_indirect) def main [ 1:address:point <- copy 10/unsafe 10:num <- copy 34 11:num <- copy 35 2:num <- get 1:address:point/lookup, 0:offset ] +mem: storing 34 in location 2 :(scenario get_indirect2) def main [ 1:address:point <- copy 10/unsafe 10:num <- copy 34 11:num <- copy 35 2:address:num <- copy 20/unsafe 2:address:num/lookup <- get 1:address:point/lookup, 0:offset ] +mem: storing 34 in location 20 :(scenario include_nonlookup_properties) def main [ 1:address:point <- copy 10/unsafe 10:num <- copy 34 11:num <- copy 35 2:num <- get 1:address:point/lookup/foo, 0:offset ] +mem: storing 34 in location 2 :(after "Update GET base in Check") if (!canonize_type(base)) break; :(after "Update GET product in Check") if (!canonize_type(product)) break; :(after "Update GET base in Run") canonize(base); :(scenario put_indirect) def main [ 1:address:point <- copy 10/unsafe 10:num <- copy 34 11:num <- copy 35 1:address:point/lookup <- put 1:address:point/lookup, 0:offset, 36 ] +mem: storing 36 in location 10 :(after "Update PUT base in Check") if (!canonize_type(base)) break; :(after "Update PUT offset in Check") if (!canonize_type(offset)) break; :(after "Update PUT base in Run") canonize(base); :(scenario put_product_error_with_lookup) % Hide_errors = true; def main [ 1:address:point <- copy 10/unsafe 10:num <- copy 34 11:num <- copy 35 1:address:point <- put 1:address:point/lookup, x:offset, 36 ] +error: main: product of 'put' must be first ingredient '1:address:point/lookup', but got '1:address:point' :(before "End PUT Product Checks") reagent/*copy*/ p = inst.products.at(0); if (!canonize_type(p)) break; // error raised elsewhere reagent/*copy*/ i = inst.ingredients.at(0); if (!canonize_type(i)) break; // error raised elsewhere if (!types_strictly_match(p, i)) { raise << maybe(get(Recipe, r).name) << "product of 'put' must be first ingredient '" << inst.ingredients.at(0).original_string << "', but got '" << inst.products.at(0).original_string << "'\n" << end(); break; } :(scenario new_error) % Hide_errors = true; def main [ 1:num/raw <- new number:type ] +error: main: product of 'new' has incorrect type: '1:num/raw <- new number:type' :(after "Update NEW product in Check") canonize_type(product); :(scenario copy_array_indirect) def main [ 10:array:num:3 <- create-array 11:num <- copy 14 12:num <- copy 15 13:num <- copy 16 1:address:array:num <- copy 10/unsafe 2:array:num <- copy 1:address:array:num/lookup ] +mem: storing 3 in location 2 +mem: storing 14 in location 3 +mem: storing 15 in location 4 +mem: storing 16 in location 5 :(scenario create_array_indirect) def main [ 1:address:array:num:3 <- copy 1000/unsafe # pretend allocation 1:address:array:num:3/lookup <- create-array ] +mem: storing 3 in location 1000 :(after "Update CREATE_ARRAY product in Check") if (!canonize_type(product)) break; :(after "Update CREATE_ARRAY product in Run") canonize(product); :(scenario index_indirect) def main [ 10:array:num:3 <- create-array 11:num <- copy 14 12:num <- copy 15 13:num <- copy 16 1:address:array:num <- copy 10/unsafe 2:num <- index 1:address:array:num/lookup, 1 ] +mem: storing 15 in location 2 :(before "Update INDEX base in Check") if (!canonize_type(base)) break; :(before "Update INDEX index in Check") if (!canonize_type(index)) break; :(before "Update INDEX product in Check") if (!canonize_type(product)) break; :(before "Update INDEX base in Run") canonize(base); :(before "Update INDEX index in Run") canonize(index); :(scenario put_index_indirect) def main [ 10:array:num:3 <- create-array 11:num <- copy 14 12:num <- copy 15 13:num <- copy 16 1:address:array:num <- copy 10/unsafe 1:address:array:num/lookup <- put-index 1:address:array:num/lookup, 1, 34 ] +mem: storing 34 in location 12 :(scenario put_index_indirect_2) def main [ 1:array:num:3 <- create-array 2:num <- copy 14 3:num <- copy 15 4:num <- copy 16 5:address:num <- copy 10/unsafe 10:num <- copy 1 1:array:num:3 <- put-index 1:array:num:3, 5:address:num/lookup, 34 ] +mem: storing 34 in location 3 :(scenario put_index_product_error_with_lookup) % Hide_errors = true; def main [ 10:array:num:3 <- create-array 11:num <- copy 14 12:num <- copy 15 13:num <- copy 16 1:address:array:num <- copy 10/unsafe 1:address:array:num <- put-index 1:address:array:num/lookup, 1, 34 ] +error: main: product of 'put-index' must be first ingredient '1:address:array:num/lookup', but got '1:address:array:num' :(before "End PUT_INDEX Product Checks") reagent/*copy*/ p = inst.products.at(0); if (!canonize_type(p)) break; // error raised elsewhere reagent/*copy*/ i = inst.ingredients.at(0); if (!canonize_type(i)) break; // error raised elsewhere if (!types_strictly_match(p, i)) { raise << maybe(get(Recipe, r).name) << "product of 'put-index' must be first ingredient '" << inst.ingredients.at(0).original_string << "', but got '" << inst.products.at(0).original_string << "'\n" << end(); break; } :(scenario dilated_reagent_in_static_array) def main [ {1: (array (address number) 3)} <- create-array 5:address:num <- new number:type {1: (array (address number) 3)} <- put-index {1: (array (address number) 3)}, 0, 5:address:num *5:address:num <- copy 34 6:num <- copy *5:address:num ] +run: creating array of size 4 +mem: storing 34 in location 6 :(before "Update PUT_INDEX base in Check") if (!canonize_type(base)) break; :(before "Update PUT_INDEX index in Check") if (!canonize_type(index)) break; :(before "Update PUT_INDEX value in Check") if (!canonize_type(value)) break; :(before "Update PUT_INDEX base in Run") canonize(base); :(before "Update PUT_INDEX index in Run") canonize(index); :(scenario length_indirect) def main [ 10:array:num:3 <- create-array 11:num <- copy 14 12:num <- copy 15 13:num <- copy 16 1:address:array:num <- copy 10/unsafe 2:num <- length 1:address:array:num/lookup ] +mem: storing 3 in location 2 :(before "Update LENGTH array in Check") if (!canonize_type(array)) break; :(before "Update LENGTH array in Run") canonize(array); :(scenario maybe_convert_indirect) def main [ 10:number-or-point <- merge 0/number, 34 1:address:number-or-point <- copy 10/unsafe 2:num, 3:bool <- maybe-convert 1:address:number-or-point/lookup, i:variant ] +mem: storing 1 in location 3 +mem: storing 34 in location 2 :(scenario maybe_convert_indirect_2) def main [ 10:number-or-point <- merge 0/number, 34 1:address:number-or-point <- copy 10/unsafe 2:address:num <- copy 20/unsafe 2:address:num/lookup, 3:bool <- maybe-convert 1:address:number-or-point/lookup, i:variant ] +mem: storing 1 in location 3 +mem: storing 34 in location 20 :(scenario maybe_convert_indirect_3) def main [ 10:number-or-point <- merge 0/number, 34 1:address:number-or-point <- copy 10/unsafe 2:address:bool <- copy 20/unsafe 3:num, 2:address:bool/lookup <- maybe-convert 1:address:number-or-point/lookup, i:variant ] +mem: storing 1 in location 20 +mem: storing 34 in location 3 :(before "Update MAYBE_CONVERT base in Check") if (!canonize_type(base)) break; :(before "Update MAYBE_CONVERT product in Check") if (!canonize_type(product)) break; :(before "Update MAYBE_CONVERT status in Check") if (!canonize_type(status)) break; :(before "Update MAYBE_CONVERT base in Run") canonize(base); :(before "Update MAYBE_CONVERT product in Run") canonize(product); :(before "Update MAYBE_CONVERT status in Run") canonize(status); :(scenario merge_exclusive_container_indirect) def main [ 1:address:number-or-point <- copy 10/unsafe 1:address:number-or-point/lookup <- merge 0/number, 34 ] +mem: storing 0 in location 10 +mem: storing 34 in location 11 :(before "Update size_mismatch Check for MERGE(x) canonize(x); //: abbreviation for '/lookup': a prefix '*' :(scenario lookup_abbreviation) def main [ 1:address:number <- copy 10/unsafe 10:number <- copy 34 3:number <- copy *1:address:number ] +parse: ingredient: {1: ("address" "number"), "lookup": ()} +mem: storing 34 in location 3 :(before "End Parsing reagent") { while (starts_with(name, "*")) { name.erase(0, 1); properties.push_back(pair<string, string_tree*>("lookup", NULL)); } if (name.empty()) raise << "illegal name '" << original_string << "'\n" << end(); } //:: helpers for debugging :(before "End Primitive Recipe Declarations") _DUMP, :(before "End Primitive Recipe Numbers") put(Recipe_ordinal, "$dump", _DUMP); :(before "End Primitive Recipe Implementations") case _DUMP: { reagent/*copy*/ after_canonize = current_instruction().ingredients.at(0); canonize(after_canonize); cerr << maybe(current_recipe_name()) << current_instruction().ingredients.at(0).name << ' ' << no_scientific(current_instruction().ingredients.at(0).value) << " => " << no_scientific(after_canonize.value) << " => " << no_scientific(get_or_insert(Memory, after_canonize.value)) << '\n'; break; } //: grab an address, and then dump its value at intervals //: useful for tracking down memory corruption (writing to an out-of-bounds address) :(before "End Globals") int Bar = -1; :(before "End Primitive Recipe Declarations") _BAR, :(before "End Primitive Recipe Numbers") put(Recipe_ordinal, "$bar", _BAR); :(before "End Primitive Recipe Implementations") case _BAR: { if (current_instruction().ingredients.empty()) { if (Bar != -1) cerr << Bar << ": " << no_scientific(get_or_insert(Memory, Bar)) << '\n'; else cerr << '\n'; } else { reagent/*copy*/ tmp = current_instruction().ingredients.at(0); canonize(tmp); Bar = tmp.value; } break; }


context:
space:
mode: