about summary refs log tree commit diff stats
path: root/cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp')
-rw-r--r--cpp/.traces/calling_recipe4
-rw-r--r--cpp/.traces/closure12
-rw-r--r--cpp/.traces/ingredient4
-rw-r--r--cpp/.traces/next_ingredient4
-rw-r--r--cpp/.traces/next_ingredient_missing4
-rw-r--r--cpp/.traces/reply4
-rw-r--r--cpp/.traces/reply_container4
-rw-r--r--cpp/.traces/return_on_fallthrough6
-rw-r--r--cpp/.traces/rewind_ingredients4
-rw-r--r--cpp/003trace11
-rw-r--r--cpp/010vm10
-rw-r--r--cpp/012transform4
-rw-r--r--cpp/041name6
-rw-r--r--cpp/054closure_name10
14 files changed, 41 insertions, 46 deletions
diff --git a/cpp/.traces/calling_recipe b/cpp/.traces/calling_recipe
index cb35c59d..763acb53 100644
--- a/cpp/.traces/calling_recipe
+++ b/cpp/.traces/calling_recipe
@@ -3,10 +3,10 @@ parse/0: instruction: 2
 parse/0:   ingredient: {name: "2", value: 0, type: 0, properties: ["2": "literal"]}
 parse/0:   ingredient: {name: "2", value: 0, type: 0, properties: ["2": "literal"]}
 parse/0:   product: {name: "3", value: 0, type: 1, properties: ["3": "integer"]}
-after-brace/0: recipe f
-after-brace/0: add ...
 after-brace/0: recipe main
 after-brace/0: f ...
+after-brace/0: recipe f
+after-brace/0: add ...
 run/0: instruction main/0
 run/0: instruction f/0
 run/0: ingredient 0 is 2
diff --git a/cpp/.traces/closure b/cpp/.traces/closure
index 73ba0a6e..f8bd5a9a 100644
--- a/cpp/.traces/closure
+++ b/cpp/.traces/closure
@@ -39,11 +39,16 @@ parse/0: instruction: 28
 parse/0:   ingredient: {name: "y", value: 0, type: 1, properties: ["y": "integer", "space": "1"]}
 name/0: recipe increment-counter is surrounded by init-counter
 new/0: location -> 1
+new/0: location -> 1
 name/0: assign x 1
 name/0: assign y 2
 new/0: space -> 0
 name/0: assign y 1
-new/0: location -> 1
+after-brace/0: recipe main
+after-brace/0: new ...
+after-brace/0: init-counter ...
+after-brace/0: increment-counter ...
+after-brace/0: increment-counter ...
 after-brace/0: recipe init-counter
 after-brace/0: new ...
 after-brace/0: copy ...
@@ -55,11 +60,6 @@ after-brace/0: next-ingredient ...
 after-brace/0: add ...
 after-brace/0: copy ...
 after-brace/0: reply ...
-after-brace/0: recipe main
-after-brace/0: new ...
-after-brace/0: init-counter ...
-after-brace/0: increment-counter ...
-after-brace/0: increment-counter ...
 run/0: instruction main/0
 mem/0: new alloc: 1000
 mem/0: array size is 30
diff --git a/cpp/.traces/ingredient b/cpp/.traces/ingredient
index 4b028b84..0d8fbf96 100644
--- a/cpp/.traces/ingredient
+++ b/cpp/.traces/ingredient
@@ -7,11 +7,11 @@ parse/0:   product: {name: "12", value: 0, type: 1, properties: ["12": "integer"
 parse/0: instruction: 25
 parse/0:   product: {name: "13", value: 0, type: 1, properties: ["13": "integer"]}
 parse/0:   product: {name: "1", value: 0, type: 3, properties: ["1": "boolean"]}
+after-brace/0: recipe main
+after-brace/0: f ...
 after-brace/0: recipe f
 after-brace/0: ingredient ...
 after-brace/0: next-ingredient ...
-after-brace/0: recipe main
-after-brace/0: f ...
 run/0: instruction main/0
 run/0: instruction f/0
 run/0: product 0 is 2
diff --git a/cpp/.traces/next_ingredient b/cpp/.traces/next_ingredient
index c9ce76a0..0d6c4bb8 100644
--- a/cpp/.traces/next_ingredient
+++ b/cpp/.traces/next_ingredient
@@ -6,11 +6,11 @@ parse/0: instruction: 2
 parse/0:   ingredient: {name: "1", value: 0, type: 0, properties: ["1": "literal"]}
 parse/0:   ingredient: {name: "12", value: 0, type: 1, properties: ["12": "integer"]}
 parse/0:   product: {name: "13", value: 0, type: 1, properties: ["13": "integer"]}
+after-brace/0: recipe main
+after-brace/0: f ...
 after-brace/0: recipe f
 after-brace/0: next-ingredient ...
 after-brace/0: add ...
-after-brace/0: recipe main
-after-brace/0: f ...
 run/0: instruction main/0
 run/0: instruction f/0
 run/0: product 0 is 2
diff --git a/cpp/.traces/next_ingredient_missing b/cpp/.traces/next_ingredient_missing
index 07d681ca..385f047b 100644
--- a/cpp/.traces/next_ingredient_missing
+++ b/cpp/.traces/next_ingredient_missing
@@ -2,10 +2,10 @@ parse/0: instruction: 1001
 parse/0: instruction: 25
 parse/0:   product: {name: "_", value: 0, type: 0, properties: ["_": "dummy"]}
 parse/0:   product: {name: "12", value: 0, type: 1, properties: ["12": "integer"]}
-after-brace/0: recipe f
-after-brace/0: next-ingredient ...
 after-brace/0: recipe main
 after-brace/0: f ...
+after-brace/0: recipe f
+after-brace/0: next-ingredient ...
 run/0: instruction main/0
 run/0: instruction f/0
 mem/0: storing 0 in location 12
diff --git a/cpp/.traces/reply b/cpp/.traces/reply
index a58a1193..566299b7 100644
--- a/cpp/.traces/reply
+++ b/cpp/.traces/reply
@@ -11,12 +11,12 @@ parse/0:   product: {name: "13", value: 0, type: 1, properties: ["13": "integer"
 parse/0: instruction: 28
 parse/0:   ingredient: {name: "12", value: 0, type: 1, properties: ["12": "integer"]}
 parse/0:   ingredient: {name: "13", value: 0, type: 1, properties: ["13": "integer"]}
+after-brace/0: recipe main
+after-brace/0: f ...
 after-brace/0: recipe f
 after-brace/0: next-ingredient ...
 after-brace/0: add ...
 after-brace/0: reply ...
-after-brace/0: recipe main
-after-brace/0: f ...
 run/0: instruction main/0
 run/0: instruction f/0
 run/0: product 0 is 2
diff --git a/cpp/.traces/reply_container b/cpp/.traces/reply_container
index 9a5d430f..10cc9548 100644
--- a/cpp/.traces/reply_container
+++ b/cpp/.traces/reply_container
@@ -8,12 +8,12 @@ parse/0:   ingredient: {name: "35", value: 0, type: 0, properties: ["35": "liter
 parse/0:   product: {name: "13", value: 0, type: 1, properties: ["13": "integer"]}
 parse/0: instruction: 28
 parse/0:   ingredient: {name: "12", value: 0, type: 6, properties: ["12": "point"]}
+after-brace/0: recipe main
+after-brace/0: f ...
 after-brace/0: recipe f
 after-brace/0: next-ingredient ...
 after-brace/0: copy ...
 after-brace/0: reply ...
-after-brace/0: recipe main
-after-brace/0: f ...
 run/0: instruction main/0
 run/0: instruction f/0
 run/0: product 0 is 2
diff --git a/cpp/.traces/return_on_fallthrough b/cpp/.traces/return_on_fallthrough
index 4408c63a..d7ac00e1 100644
--- a/cpp/.traces/return_on_fallthrough
+++ b/cpp/.traces/return_on_fallthrough
@@ -14,14 +14,14 @@ parse/0:   product: {name: "4", value: 0, type: 1, properties: ["4": "integer"]}
 parse/0: instruction: 1
 parse/0:   ingredient: {name: "34", value: 0, type: 0, properties: ["34": "literal"]}
 parse/0:   product: {name: "5", value: 0, type: 1, properties: ["5": "integer"]}
-after-brace/0: recipe f
-after-brace/0: copy ...
-after-brace/0: copy ...
 after-brace/0: recipe main
 after-brace/0: f ...
 after-brace/0: copy ...
 after-brace/0: copy ...
 after-brace/0: copy ...
+after-brace/0: recipe f
+after-brace/0: copy ...
+after-brace/0: copy ...
 run/0: instruction main/0
 run/0: instruction f/0
 run/0: ingredient 0 is 34
diff --git a/cpp/.traces/rewind_ingredients b/cpp/.traces/rewind_ingredients
index 9c36302a..ed1bff38 100644
--- a/cpp/.traces/rewind_ingredients
+++ b/cpp/.traces/rewind_ingredients
@@ -9,13 +9,13 @@ parse/0: instruction: 26
 parse/0: instruction: 25
 parse/0:   product: {name: "13", value: 0, type: 1, properties: ["13": "integer"]}
 parse/0:   product: {name: "2", value: 0, type: 3, properties: ["2": "boolean"]}
+after-brace/0: recipe main
+after-brace/0: f ...
 after-brace/0: recipe f
 after-brace/0: next-ingredient ...
 after-brace/0: next-ingredient ...
 after-brace/0: rewind-ingredients ...
 after-brace/0: next-ingredient ...
-after-brace/0: recipe main
-after-brace/0: f ...
 run/0: instruction main/0
 run/0: instruction f/0
 run/0: product 0 is 2
diff --git a/cpp/003trace b/cpp/003trace
index af4858bf..f2070bae 100644
--- a/cpp/003trace
+++ b/cpp/003trace
@@ -93,7 +93,7 @@ Hide_warnings = false;
 :(before "End Tracing")
 struct trace_stream {
   vector<pair<string, pair<int, string> > > past_lines;  // [(layer label, frame, line)]
-  unordered_map<string, int> frame;
+  map<string, int> frame;
   // accumulator for current line
   ostringstream* curr_stream;
   string curr_layer;
@@ -458,11 +458,10 @@ using std::vector;
 using std::list;
 #include<utility>
 using std::pair;
-
-#include<tr1/unordered_map>
-using std::tr1::unordered_map;
-#include<tr1/unordered_set>
-using std::tr1::unordered_set;
+#include<map>
+using std::map;
+#include<set>
+using std::set;
 #include<algorithm>
 
 #include<iostream>
diff --git a/cpp/010vm b/cpp/010vm
index 76d41a71..48b68cdf 100644
--- a/cpp/010vm
+++ b/cpp/010vm
@@ -2,8 +2,8 @@
 // A program is a book of 'recipes' (functions)
 typedef int recipe_number;
 :(before "End Globals")
-unordered_map<string, recipe_number> Recipe_number;
-unordered_map<recipe_number, recipe> Recipe;
+map<string, recipe_number> Recipe_number;
+map<recipe_number, recipe> Recipe;
 int Next_recipe_number = 1;
 
 :(before "End Types")
@@ -56,7 +56,7 @@ struct property {
 
 :(before "End Globals")
 // Locations refer to a common 'memory'. Each location can store a number.
-unordered_map<int, int> Memory;
+map<int, int> Memory;
 :(before "End Setup")
 Memory.clear();
 
@@ -71,8 +71,8 @@ Memory.clear();
 // seamless experience to help understand arbitrary mu programs.
 typedef int type_number;
 :(before "End Globals")
-unordered_map<string, type_number> Type_number;
-unordered_map<type_number, type_info> Type;
+map<string, type_number> Type_number;
+map<type_number, type_info> Type;
 int Next_type_number = 1;
 :(code)
 void setup_types() {
diff --git a/cpp/012transform b/cpp/012transform
index 59b87e69..888c7585 100644
--- a/cpp/012transform
+++ b/cpp/012transform
@@ -17,7 +17,7 @@ vector<transform_fn> Transform;
 void transform_all() {
 //?   cout << "AAA transform_all\n"; //? 1
   for (size_t t = 0; t < Transform.size(); ++t) {
-    for (unordered_map<recipe_number, recipe>::iterator p = Recipe.begin(); p != Recipe.end(); ++p) {
+    for (map<recipe_number, recipe>::iterator p = Recipe.begin(); p != Recipe.end(); ++p) {
       recipe& r = p->second;
       if (r.steps.empty()) continue;
       if (r.transformed_until != t-1) continue;
@@ -30,7 +30,7 @@ void transform_all() {
 
 void parse_int_reagents() {
 //?   cout << "parse_int_reagents\n"; //? 1
-  for (unordered_map<recipe_number, recipe>::iterator p = Recipe.begin(); p != Recipe.end(); ++p) {
+  for (map<recipe_number, recipe>::iterator p = Recipe.begin(); p != Recipe.end(); ++p) {
     recipe& r = p->second;
     if (r.steps.empty()) continue;
     for (size_t index = 0; index < r.steps.size(); ++index) {
diff --git a/cpp/041name b/cpp/041name
index 071f6f5a..6afb6b07 100644
--- a/cpp/041name
+++ b/cpp/041name
@@ -21,7 +21,7 @@ recipe main [
   Transform.push_back(transform_names);
 
 :(before "End Globals")
-unordered_map<recipe_number, unordered_map<string, int> > Name;
+map<recipe_number, map<string, int> > Name;
 :(after "Clear Other State For recently_added_recipes")
 for (size_t i = 0; i < recently_added_recipes.size(); ++i) {
   Name.erase(recently_added_recipes[i]);
@@ -29,7 +29,7 @@ for (size_t i = 0; i < recently_added_recipes.size(); ++i) {
 
 :(code)
 void transform_names(const recipe_number r) {
-  unordered_map<string, int>& names = Name[r];
+  map<string, int>& names = Name[r];
   int curr_idx = 1;
 //?   cout << "Recipe " << r << '\n'; //? 2
 //?   cout << Recipe[r].steps.size(); //? 1
@@ -77,7 +77,7 @@ void transform_names(const recipe_number r) {
   }
 }
 
-bool already_transformed(const reagent& r, const unordered_map<string, int>& names) {
+bool already_transformed(const reagent& r, const map<string, int>& names) {
   return names.find(r.name) != names.end();
 }
 
diff --git a/cpp/054closure_name b/cpp/054closure_name
index ea48694b..b6ba686a 100644
--- a/cpp/054closure_name
+++ b/cpp/054closure_name
@@ -35,7 +35,7 @@ recipe increment-counter [
 //: surrounding space of each recipe. This must happen before transform_names.
 
 :(before "End Globals")
-unordered_map<recipe_number, recipe_number> Surrounding_space;
+map<recipe_number, recipe_number> Surrounding_space;
 
 :(after "int main")
   Transform.push_back(collect_surrounding_spaces);
@@ -130,8 +130,8 @@ recipe_number lookup_surrounding_recipe(const recipe_number r, size_t n) {
 }
 
 //: weaken use-before-set warnings just a tad
-:(replace{} "bool already_transformed(const reagent& r, const unordered_map<string, int>& names)")
-bool already_transformed(const reagent& r, const unordered_map<string, int>& names) {
+:(replace{} "bool already_transformed(const reagent& r, const map<string, int>& names)")
+bool already_transformed(const reagent& r, const map<string, int>& names) {
   if (has_property(r, "space")) {
     vector<string> p = property(r, "space");
     assert(p.size() == 1);
@@ -139,7 +139,3 @@ bool already_transformed(const reagent& r, const unordered_map<string, int>& nam
   }
   return names.find(r.name) != names.end();
 }
-
-:(before "End Includes")
-#include<set>
-using std::set;
generated by cgit-pink 1.4.1-2-gfad0 (git 2.36.2.497.gbbea4dcf42) at 2025-01-01 14:33:21 +0000
3'>423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 
705
706
707
708