about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorKartik K. Agaram <vc@akkartik.com>2016-03-14 01:00:48 -0700
committerKartik K. Agaram <vc@akkartik.com>2016-03-14 01:00:48 -0700
commit2badd89a58b9666563746d71069abf16f05709ea (patch)
tree779c9feb243fc8d0f33051cd8323fd23f912f373
parent8b095f802129f8c328a3a4dc3de4443890d34d59 (diff)
downloadmu-2badd89a58b9666563746d71069abf16f05709ea.tar.gz
2778 - fix all layers
-rw-r--r--053dilated_reagent.cc (renamed from 054dilated_reagent.cc)0
-rw-r--r--054parse_tree.cc (renamed from 055parse_tree.cc)0
-rw-r--r--055recipe_header.cc (renamed from 056recipe_header.cc)0
-rw-r--r--056static_dispatch.cc (renamed from 057static_dispatch.cc)0
-rw-r--r--057shape_shifting_container.cc (renamed from 058shape_shifting_container.cc)0
-rw-r--r--058shape_shifting_recipe.cc (renamed from 059shape_shifting_recipe.cc)0
-rw-r--r--064rewrite_literal_string.cc13
-rw-r--r--071rewrite_stash.cc (renamed from 053rewrite_stash.cc)13
-rw-r--r--072channel.mu (renamed from 071channel.mu)0
-rw-r--r--073array.mu (renamed from 072array.mu)0
-rw-r--r--074list.mu (renamed from 073list.mu)0
-rw-r--r--075random.cc (renamed from 074random.cc)0
-rw-r--r--076duplex_list.mu (renamed from 075duplex_list.mu)0
-rw-r--r--077stream.mu (renamed from 076stream.mu)0
-rw-r--r--078hash.cc (renamed from 077hash.cc)0
-rw-r--r--079table.mu (renamed from 078table.mu)0
-rwxr-xr-xbuild_and_test_until2
17 files changed, 15 insertions, 13 deletions
diff --git a/054dilated_reagent.cc b/053dilated_reagent.cc
index 8e141a43..8e141a43 100644
--- a/054dilated_reagent.cc
+++ b/053dilated_reagent.cc
diff --git a/055parse_tree.cc b/054parse_tree.cc
index a65f87e7..a65f87e7 100644
--- a/055parse_tree.cc
+++ b/054parse_tree.cc
diff --git a/056recipe_header.cc b/055recipe_header.cc
index d6caf76b..d6caf76b 100644
--- a/056recipe_header.cc
+++ b/055recipe_header.cc
diff --git a/057static_dispatch.cc b/056static_dispatch.cc
index da97ea80..da97ea80 100644
--- a/057static_dispatch.cc
+++ b/056static_dispatch.cc
diff --git a/058shape_shifting_container.cc b/057shape_shifting_container.cc
index 1a458bb7..1a458bb7 100644
--- a/058shape_shifting_container.cc
+++ b/057shape_shifting_container.cc
diff --git a/059shape_shifting_recipe.cc b/058shape_shifting_recipe.cc
index 35791147..35791147 100644
--- a/059shape_shifting_recipe.cc
+++ b/058shape_shifting_recipe.cc
diff --git a/064rewrite_literal_string.cc b/064rewrite_literal_string.cc
index 86a18e81..db23a441 100644
--- a/064rewrite_literal_string.cc
+++ b/064rewrite_literal_string.cc
@@ -51,3 +51,16 @@ void rewrite_literal_string_to_text(recipe_ordinal r) {
   caller.steps.swap(new_instructions);
 //?   cerr << "aa: " << to_string(caller) << '\n';
 }
+
+bool contains_numeric_locations(const recipe& caller) {
+  for (int i = 0; i < SIZE(caller.steps); ++i) {
+    const instruction& inst = caller.steps.at(i);
+    for (int in = 0; in < SIZE(inst.ingredients); ++in)
+      if (is_numeric_location(inst.ingredients.at(in)))
+        return true;
+    for (int out = 0; out < SIZE(inst.products); ++out)
+      if (is_numeric_location(inst.products.at(out)))
+        return true;
+  }
+  return false;
+}
diff --git a/053rewrite_stash.cc b/071rewrite_stash.cc
index e753050e..ea7c140f 100644
--- a/053rewrite_stash.cc
+++ b/071rewrite_stash.cc
@@ -23,19 +23,6 @@ void rewrite_stashes_to_text(recipe_ordinal r) {
   rewrite_stashes_to_text(caller);
 }
 
-bool contains_numeric_locations(const recipe& caller) {
-  for (int i = 0; i < SIZE(caller.steps); ++i) {
-    const instruction& inst = caller.steps.at(i);
-    for (int in = 0; in < SIZE(inst.ingredients); ++in)
-      if (is_numeric_location(inst.ingredients.at(in)))
-        return true;
-    for (int out = 0; out < SIZE(inst.products); ++out)
-      if (is_numeric_location(inst.products.at(out)))
-        return true;
-  }
-  return false;
-}
-
 void rewrite_stashes_to_text(recipe& caller) {
   vector<instruction> new_instructions;
   for (int i = 0; i < SIZE(caller.steps); ++i) {
diff --git a/071channel.mu b/072channel.mu
index a9068603..a9068603 100644
--- a/071channel.mu
+++ b/072channel.mu
diff --git a/072array.mu b/073array.mu
index fcd1fcb7..fcd1fcb7 100644
--- a/072array.mu
+++ b/073array.mu
diff --git a/073list.mu b/074list.mu
index 856c5e9c..856c5e9c 100644
--- a/073list.mu
+++ b/074list.mu
diff --git a/074random.cc b/075random.cc
index 4be8f05b..4be8f05b 100644
--- a/074random.cc
+++ b/075random.cc
diff --git a/075duplex_list.mu b/076duplex_list.mu
index f4ff27cd..f4ff27cd 100644
--- a/075duplex_list.mu
+++ b/076duplex_list.mu
diff --git a/076stream.mu b/077stream.mu
index c3af2ddf..c3af2ddf 100644
--- a/076stream.mu
+++ b/077stream.mu
diff --git a/077hash.cc b/078hash.cc
index f8003cbe..f8003cbe 100644
--- a/077hash.cc
+++ b/078hash.cc
diff --git a/078table.mu b/079table.mu
index 56b7c9fd..56b7c9fd 100644
--- a/078table.mu
+++ b/079table.mu
diff --git a/build_and_test_until b/build_and_test_until
index d4fedaf2..15e0e4cd 100755
--- a/build_and_test_until
+++ b/build_and_test_until
@@ -9,4 +9,6 @@ make --no-print-directory enumerate/enumerate
 ./tangle/tangle $(./enumerate/enumerate --until $1 |grep -v '.mu$') |grep -v "^\s*//:" > mu.cc
 cat /dev/null $(./enumerate/enumerate --until $1 |grep '.mu$') > core.mu
 make --no-print-directory autogenerated_lists
+sleep 1  # Darwin is shit and otherwise thinks mu_bin is newer than the files it just generated when called from test_all_layers.
+         # All sorts of strange bugs ensue.
 CXX=${CXX:-clang++} CFLAGS=${CFLAGS:-"-O3 -fsanitize=undefined -Wno-tautological-constant-out-of-range-compare"} make ${2:-valgrind}