From 0d9d275314f98dceec1118e80eaab89a00c3ad3e Mon Sep 17 00:00:00 2001
From: "Kartik K. Agaram" <vc@akkartik.com>
Date: Sat, 5 Sep 2015 11:23:20 -0700
Subject: 2154 - check types only after loading all layers

Follow-up to 2147, which switched transform_all to only run once, after
loading all layers.
---
 011load.cc      | 1 -
 012transform.cc | 1 +
 020run.cc       | 2 +-
 030container.cc | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/011load.cc b/011load.cc
index d3455217..1e43ead0 100644
--- a/011load.cc
+++ b/011load.cc
@@ -37,7 +37,6 @@ vector<recipe_ordinal> load(istream& in) {
       raise << "unknown top-level command: " << command << '\n' << end();
     }
   }
-  // End Load Sanity Checks
   return result;
 }
 
diff --git a/012transform.cc b/012transform.cc
index 614e53ed..59af0e22 100644
--- a/012transform.cc
+++ b/012transform.cc
@@ -25,6 +25,7 @@ void transform_all() {
     }
   }
   parse_int_reagents();  // do this after all other transforms have run
+  // End Transform
 }
 
 void parse_int_reagents() {
diff --git a/020run.cc b/020run.cc
index a194b7ab..7c2da3b7 100644
--- a/020run.cc
+++ b/020run.cc
@@ -220,8 +220,8 @@ transform_all();
 // helper for tests
 void run(string form) {
   vector<recipe_ordinal> tmp = load(form);
-  if (tmp.empty()) return;
   transform_all();
+  if (tmp.empty()) return;
   run(tmp.front());
 }
 
diff --git a/030container.cc b/030container.cc
index c89353a3..8505f475 100644
--- a/030container.cc
+++ b/030container.cc
@@ -455,7 +455,7 @@ container foo [
 +parse:   element name: y
 +parse:   type: 1
 
-:(before "End Load Sanity Checks")
+:(before "End Transform")
 check_container_field_types();
 
 :(code)
-- 
cgit 1.4.1-2-gfad0