| Commit message (Expand) | Author | Age | Files | Lines |
* | 1994 - new primitive: 'create-array' | Kartik K. Agaram | 2015-08-14 | 1 | -1/+3 |
* | 1988 - handle reagents without types | Kartik K. Agaram | 2015-08-13 | 1 | -4/+4 |
* | 1975 - let's start using traces in lessons | Kartik K. Agaram | 2015-08-10 | 1 | -0/+9 |
* | 1962 | Kartik K. Agaram | 2015-08-09 | 1 | -3/+3 |
* | 1952 | Kartik K. Agaram | 2015-08-07 | 1 | -0/+8 |
* | 1948 | Kartik K. Agaram | 2015-08-06 | 1 | -2/+2 |
* | 1931 - basic support for scrolling | Kartik K. Agaram | 2015-08-04 | 1 | -1/+19 |
* | 1923 | Kartik K. Agaram | 2015-08-02 | 1 | -3/+2 |
* | 1909 - clean up all null pointers of that ilk | Kartik K. Agaram | 2015-07-31 | 1 | -10/+10 |
* | 1908 - another null-pointer warning | Kartik K. Agaram | 2015-07-31 | 1 | -0/+5 |
* | 1886 - gracefully handle malformed ingredients | Kartik K. Agaram | 2015-07-29 | 1 | -2/+4 |
* | 1868 - start using naked literals everywhere | Kartik K. Agaram | 2015-07-28 | 1 | -39/+39 |
* | 1848 - core instructions now check for ingredients | Kartik K. Agaram | 2015-07-25 | 1 | -5/+5 |
* | 1844 - explicitly end each trace line | Kartik K. Agaram | 2015-07-25 | 1 | -18/+18 |
* | 1834 | Kartik K. Agaram | 2015-07-24 | 1 | -4/+8 |
* | 1833 | Kartik K. Agaram | 2015-07-24 | 1 | -1/+8 |
* | 1832 | Kartik K. Agaram | 2015-07-24 | 1 | -1/+4 |
* | 1826 - edit: start carefully showing all errors | Kartik K. Agaram | 2015-07-21 | 1 | -2/+4 |
* | 1800 - ah, found the bounds-checking bug | Kartik K. Agaram | 2015-07-17 | 1 | -5/+50 |
* | 1744 - support just two editors rather than a list | Kartik K. Agaram | 2015-07-09 | 1 | -0/+4 |
* | 1702 - experiment: start using 'ordinal' in names | Kartik K. Agaram | 2015-07-04 | 1 | -36/+36 |
* | 1668 - there's a bug in CHECK_TRACE_DOESNT_CONTAIN | Kartik K. Agaram | 2015-06-27 | 1 | -0/+1 |
* | 1629 - new helper for constructing containers | Kartik K. Agaram | 2015-06-23 | 1 | -0/+27 |
* | 1604 | Kartik K. Agaram | 2015-06-20 | 1 | -1/+2 |
* | 1593 | Kartik K. Agaram | 2015-06-18 | 1 | -1/+2 |
* | 1586 | Kartik K. Agaram | 2015-06-17 | 1 | -1/+1 |
* | 1585 | Kartik K. Agaram | 2015-06-17 | 1 | -2/+2 |
* | 1497 - 2 boneheaded bugs in parsing scenarios | Kartik K. Agaram | 2015-05-28 | 1 | -0/+12 |
* | 1474 - another warning | Kartik K. Agaram | 2015-05-26 | 1 | -7/+10 |
* | 1417 - draft zoom levels in traces | Kartik K. Agaram | 2015-05-21 | 1 | -3/+3 |
* | 1414 - traces now robust to new recipes/types | Kartik K. Agaram | pre { line-height: 125%; }
td.linenos .normal { color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px; }
span.linenos { color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px; }
td.linenos .special { color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px; }
span.linenos.special { color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px; }
.highlight .hll { background-color: #ffffcc }
.highlight .c { color: #888888 } /* Comment */
.highlight .err { color: #a61717; background-color: #e3d2d2 } /* Error */
.highlight .k { color: #008800; font-weight: bold } /* Keyword */
.highlight .ch { color: #888888 } /* Comment.Hashbang */
.highlight .cm { color: #888888 } /* Comment.Multiline */
.highlight .cp { color: #cc0000; font-weight: bold } /* Comment.Preproc */
.highlight .cpf { color: #888888 } /* Comment.PreprocFile */
.highlight .c1 { color: #888888 } /* Comment.Single */
.highlight .cs { color: #cc0000; font-weight: bold; background-color: #fff0f0 } /* Comment.Special */
.highlight .gd { color: #000000; background-color: #ffdddd } /* Generic.Deleted */
.highlight .ge { font-style: italic } /* Generic.Emph */
.highlight .ges { font-weight: bold; font-style: italic } /* Generic.EmphStrong */
.highlight .gr { color: #aa0000 } /* Generic.Error */
.highlight .gh { color: #333333 } /* Generic.Heading */
.highlight .gi { color: #000000; background-color: #ddffdd } /* Generic.Inserted */
.highlight .go { color: #888888 } /* Generic.Output */
.highlight .gp { color: #555555 } /* Generic.Prompt */
.highlight .gs { font-weight: bold } /* Generic.Strong */
.highlight .gu { color: #666666 } /* Generic.Subheading */
.highlight .gt { color: #aa0000 } /* Generic.Traceback */
.highlight .kc { color: #008800; font-weight: bold } /* Keyword.Constant */
.highlight .kd { color: #008800; font-weight: bold } /* Keyword.Declaration */
.highlight .kn { color: #008800; font-weight: bold } /* Keyword.Namespace */
.highlight .kp { color: #008800 } /* Keyword.Pseudo */
.highlight .kr { color: #008800; font-weight: bold } /* Keyword.Reserved */
.highlight .kt { color: #888888; font-weight: bold } /* Keyword.Type */
.highlight .m { color: #0000DD; font-weight: bold } /* Literal.Number */
.highlight .s { color: #dd2200; background-color: #fff0f0 } /* Literal.String */
.highlight .na { color: #336699 } /* Name.Attribute */
.highlight .nb { color: #003388 } /* Name.Builtin */
.highlight .nc { color: #bb0066; font-weight: bold } /* Name.Class */
.highlight .no { color: #003366; font-weight: bold } /* Name.Constant */
.highlight .nd { color: #555555 } /* Name.Decorator */
.highlight .ne { color: #bb0066; font-weight: bold } /* Name.Exception */
.highlight .nf { color: #0066bb; font-weight: bold } /* Name.Function */
.highlight .nl { color: #336699; font-style: italic } /* Name.Label */
.highlight .nn { color: #bb0066; font-weight: bold } /* Name.Namespace */
.highlight .py { color: #336699; font-weight: bold } /* Name.Property */
.highlight .nt { color: #bb0066; font-weight: bold } /* Name.Tag */
.highlight .nv { color: #336699 } /* Name.Variable */
.highlight .ow { color: #008800 } /* Operator.Word */
.highlight .w { color: #bbbbbb } /* Text.Whitespace */
.highlight .mb { color: #0000DD; font-weight: bold } /* Literal.Number.Bin */
.highlight .mf { color: #0000DD; font-weight: bold } /* Literal.Number.Float */
.highlight .mh { color: #0000DD; font-weight: bold } /* Literal.Number.Hex */
.highlight .mi { color: #0000DD; font-weight: bold } /* Literal.Number.Integer */
.highlight .mo { color: #0000DD; font-weight: bold } /* Literal.Number.Oct */
.highlight .sa { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Affix */
.highlight .sb { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Backtick */
.highlight .sc { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Char */
.highlight .dl { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Delimiter */
.highlight .sd { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Doc */
.highlight .s2 { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Double */
.highlight .se { color: #0044dd; background-color: #fff0f0 } /* Literal.String.Escape */
.highlight .sh { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Heredoc */
.highlight .si { color: #3333bb; background-color: #fff0f0 } /* Literal.String.Interpol */
.highlight .sx { color: #22bb22; background-color: #f0fff0 } /* Literal.String.Other */
.highlight .sr { color: #008800; background-color: #fff0ff } /* Literal.String.Regex */
.highlight .s1 { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Single */
.highlight .ss { color: #aa6600; background-color: #fff0f0 } /* Literal.String.Symbol */
.highlight .bp { color: #003388 } /* Name.Builtin.Pseudo */
.highlight .fm { color: #0066bb; font-weight: bold } /* Name.Function.Magic */
.highlight .vc { color: #336699 } /* Name.Variable.Class */
.highlight .vg { color: #dd7700 } /* Name.Variable.Global */
.highlight .vi { color: #3333bb } /* Name.Variable.Instance */
.highlight .vm { color: #336699 } /* Name.Variable.Magic */
.highlight .il { color: #0000DD; font-weight: bold } /* Literal.Number.Integer.Long *///: Arrays contain a variable number of elements of the same type. Their value
//: starts with the length of the array.
//:
//: You can create arrays of containers, but containers can only contain
//: elements of a fixed size, so you can't create containers containing arrays.
//: Create containers containing addresses to arrays instead.
//: You can create arrays using 'create-array'.
:(scenario create_array)
recipe main [
# create an array occupying locations 1 (for the size) and 2-4 (for the elements)
1:array:number:3 <- create-array
]
+run: creating array of size 4
:(before "End Primitive Recipe Declarations")
CREATE_ARRAY,
:(before "End Primitive Recipe Numbers")
Recipe_ordinal["create-array"] = CREATE_ARRAY;
:(before "End Primitive Recipe Implementations")
case CREATE_ARRAY: {
if (current_instruction().products.empty()) {
raise << current_recipe_name () << ": 'create-array' needs one product and no ingredients but got '" << current_instruction().to_string() << '\n' << end();
break;
}
reagent product = canonize(current_instruction().products.at(0));
if (!is_mu_array(product)) {
raise << current_recipe_name () << ": 'create-array' cannot create non-array " << product.original_string << '\n' << end();
break;
}
long long int base_address = product.value;
if (SIZE(product.types) == 1) {
raise << current_recipe_name () << ": create array of what? " << current_instruction().to_string() << '\n' << end();
break;
}
// 'create-array' will need to check properties rather than types
if (SIZE(product.properties.at(0).second) <= 2) {
raise << current_recipe_name () << ": create array of what size? " << current_instruction().to_string() << '\n' << end();
break;
}
if (!is_integer(product.properties.at(0).second.at(2))) {
raise << current_recipe_name () << ": 'create-array' product should specify size of array after its element type, but got " << product.properties.at(0).second.at(2) << '\n' << end();
break;
}
long long int array_size= to_integer(product.properties.at(0).second.at(2));
// initialize array size, so that size_of will work
Memory[base_address] = array_size; // in array elements
long long int size = size_of(product); // in locations
trace("run") << "creating array of size " << size << '\n' << end();
// initialize array
for (long long int i = 1; i <= size_of(product); ++i) {
Memory[base_address+i] = 0;
}
// dummy product; doesn't actually do anything
products.resize(1);
products.at(0).push_back(array_size);
break;
}
:(scenario copy_array)
# Arrays can be copied around with a single instruction just like numbers,
# no matter how large they are.
recipe main [
1:array:number:3 <- create-array
2:number <- copy 14
3:number <- copy 15
4:number <- copy 16
5:array:number <- copy 1:array:number:3
]
+mem: storing 3 in location 5
+mem: storing 14 in location 6
+mem: storing 15 in location 7
+mem: storing 16 in location 8
:(scenario copy_array_indirect)
recipe main [
1:array:number:3 <- create-array
2:number <- copy 14
3:number <- copy 15
4:number <- copy 16
5:address:array:number <- copy 1 # unsafe
6:array:number <- copy *5:address:array:number
]
+mem: storing 3 in location 6
+mem: storing 14 in location 7
+mem: storing 15 in location 8
+mem: storing 16 in location 9
:(scenario stash_array)
recipe main [
1:array:number:3 <- create-array
2:number <- copy 14
3:number <- copy 15
4:number <- copy 16
stash [foo: ], 1:array:number:3
]
+app: foo: 3 14 15 16
//: disable the size mismatch check since the destination array need not be initialized
:(before "End size_mismatch(x) Cases")
if (x.types.at(0) == Type_ordinal["array"]) return false;
:(before "End size_of(reagent) Cases")
if (r.types.at(0) == Type_ordinal["array"]) {
if (SIZE(r.types) == 1) {
raise << current_recipe_name() << ": '" << r.original_string << "' is an array of what?\n" << end();
return 1;
}
// skip the 'array' type to get at the element type
return 1 + Memory[r.value]*size_of(array_element(r.types));
}
//:: To access elements of an array, use 'index'
:(scenario index)
recipe main [
1:array:number:3 <- create-array
2:number <- copy 14
3:number <- copy 15
4:number <- copy 16
5:number <- index 1:array:number:3, 0
]
+mem: storing 14 in location 5
:(scenario index_direct_offset)
recipe main [
1:array:number:3 <- create-array
2:number <- copy 14
3:number <- copy 15
4:number <- copy 16
5:number <- copy 0
6:number <- index 1:array:number, 5:number
]
+mem: storing 14 in location 6
:(before "End Primitive Recipe Declarations")
INDEX,
:(before "End Primitive Recipe Numbers")
Recipe_ordinal["index"] = INDEX;
:(before "End Primitive Recipe Implementations")
case INDEX: {
if (SIZE(current_instruction().ingredients) != 2) {
raise << current_recipe_name() << ": 'index' expects exactly 2 ingredients in '" << current_instruction().to_string() << "'\n" << end();
break;
}
reagent base = canonize(current_instruction().ingredients.at(0));
if (!is_mu_array(base)) {
raise << current_recipe_name () << ": 'index' on a non-array " << base.original_string << '\n' << end();
break;
}
long long int base_address = base.value;
if (base_address == 0) {
raise << current_recipe_name() << ": tried to access location 0 in '" << current_instruction().to_string() << "'\n" << end();
break;
}
reagent offset = canonize(current_instruction().ingredients.at(1));
vector<double> offset_val(read_memory(offset));
vector<type_ordinal> element_type = array_element(base.types);
if (offset_val.at(0) < 0 || offset_val.at(0) >= Memory[base_address]) {
raise << current_recipe_name() << ": invalid index " << offset_val.at(0) << '\n' << end();
break;
}
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 << end();
trace(Primitive_recipe_depth, "run") << "its type is " << Type[element_type.at(0)].name << end();
reagent tmp;
tmp.set_value(src);
copy(element_type.begin(), element_type.end(), inserter(tmp.types, tmp.types.begin()));
products.push_back(read_memory(tmp));
break;
}
:(code)
vector<type_ordinal> array_element(const vector<type_ordinal>& types) {
return vector<type_ordinal>(++types.begin(), types.end());
}
:(scenario index_indirect)
recipe main [
1:array:number:3 <- create-array
2:number <- copy 14
3:number <- copy 15
4:number <- copy 16
5:address:array:number <- copy 1
6:number <- index *5:address:array:number, 1
]
+mem: storing 15 in location 6
:(scenario index_out_of_bounds)
% Hide_warnings = true;
recipe main [
1:array:number:3 <- create-array
2:number <- copy 14
3:number <- copy 15
4:number <- copy 16
5:number <- copy 14
6:number <- copy 15
7:number <- copy 16
8:address:array:point <- copy 1
index *8:address:array:point, 4 # less than size of array in locations, but larger than its length in elements
]
+warn: main: invalid index 4
:(scenario index_out_of_bounds_2)
% Hide_warnings = true;
recipe main [
1:array:point:3 <- create-array
2:number <- copy 14
3:number <- copy 15
4:number <- copy 16
5:number <- copy 14
6:number <- copy 15
7:number <- copy 16
8:address:array:point <- copy 1
index *8:address:array:point, -1
]
+warn: main: invalid index -1
//:: To write to elements of containers, you need their address.
:(scenario index_address)
recipe main [
1:array:number:3 <- create-array
2:number <- copy 14
3:number <- copy 15
4:number <- copy 16
5:number <- index-address 1:array:number, 0
]
+mem: storing 2 in location 5
:(before "End Primitive Recipe Declarations")
INDEX_ADDRESS,
:(before "End Primitive Recipe Numbers")
Recipe_ordinal["index-address"] = INDEX_ADDRESS;
:(before "End Primitive Recipe Implementations")
case INDEX_ADDRESS: {
if (SIZE(current_instruction().ingredients) != 2) {
raise << current_recipe_name() << ": 'index-address' expects exactly 2 ingredients in '" << current_instruction().to_string() << "'\n" << end();
break;
}
reagent base = canonize(current_instruction().ingredients.at(0));
if (!is_mu_array(base)) {
raise << current_recipe_name () << ": 'index-address' on a non-array " << base.original_string << '\n' << end();
break;
}
long long int base_address = base.value;
if (base_address == 0) {
raise << current_recipe_name() << ": tried to access location 0 in '" << current_instruction().to_string() << "'\n" << end();
break;
}
reagent offset = canonize(current_instruction().ingredients.at(1));
vector<double> offset_val(read_memory(offset));
vector<type_ordinal> element_type = array_element(base.types);
if (offset_val.at(0) < 0 || offset_val.at(0) >= Memory[base_address]) {
raise << current_recipe_name() << ": invalid index " << offset_val.at(0) << '\n' << end();
break;
}
long long int result = base_address + 1 + offset_val.at(0)*size_of(element_type);
products.resize(1);
products.at(0).push_back(result);
break;
}
:(scenario index_address_out_of_bounds)
% Hide_warnings = true;
recipe main [
1:array:point:3 <- create-array
2:number <- copy 14
3:number <- copy 15
4:number <- copy 16
5:number <- copy 14
6:number <- copy 15
7:number <- copy 16
8:address:array:point <- copy 1 # unsafe
index-address *8:address:array:point, 4 # less than size of array in locations, but larger than its length in elements
]
+warn: main: invalid index 4
:(scenario index_address_out_of_bounds_2)
% Hide_warnings = true;
recipe main [
1:array:point:3 <- create-array
2:number <- copy 14
3:number <- copy 15
4:number <- copy 16
5:number <- copy 14
6:number <- copy 15
7:number <- copy 16
8:address:array:point <- copy 1 # unsafe
index-address *8:address:array:point, -1
]
+warn: main: invalid index -1
//:: compute the length of an array
:(scenario array_length)
recipe main [
1:array:number:3 <- create-array
2:number <- copy 14
3:number <- copy 15
4:number <- copy 16
5:number <- length 1:array:number:3
]
+mem: storing 3 in location 5
:(before "End Primitive Recipe Declarations")
LENGTH,
:(before "End Primitive Recipe Numbers")
Recipe_ordinal["length"] = LENGTH;
:(before "End Primitive Recipe Implementations")
case LENGTH: {
if (SIZE(current_instruction().ingredients) != 1) {
raise << current_recipe_name() << ": 'length' expects exactly 2 ingredients in '" << current_instruction().to_string() << "'\n" << end();
break;
}
reagent x = canonize(current_instruction().ingredients.at(0));
if (!is_mu_array(x)) {
raise << "tried to calculate length of non-array " << x.original_string << '\n' << end();
break;
}
if (x.value == 0) {
raise << current_recipe_name() << ": tried to access location 0 in '" << current_instruction().to_string() << "'\n" << end();
break;
}
products.resize(1);
products.at(0).push_back(Memory[x.value]);
break;
}
//: optimization: none of the instructions in this layer use 'ingredients' so
//: stop copying potentially huge arrays into it.
:(before "End should_copy_ingredients Special-cases")
recipe_ordinal r = current_instruction().operation;
if (r == CREATE_ARRAY || r == INDEX || r == INDEX_ADDRESS || r == LENGTH)
return false;
|