From 2e38a3486eb4a7b4ae488cec31efc0085224ccdb Mon Sep 17 00:00:00 2001
From: Jeremy Wall <jeremy@marzhillstudios.com>
Date: Thu, 28 Mar 2019 20:38:02 -0400
Subject: [PATCH] FIX: import cycle detection which was broken.

---
 example_errors/import_cycle1.ucg | 2 +-
 example_errors/import_cycle2.ucg | 2 +-
 example_errors/import_cycle3.ucg | 2 +-
 src/build/mod.rs                 | 4 ++++
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/example_errors/import_cycle1.ucg b/example_errors/import_cycle1.ucg
index c3da14e..9fdfea4 100644
--- a/example_errors/import_cycle1.ucg
+++ b/example_errors/import_cycle1.ucg
@@ -1 +1 @@
-import "import_cycle2.ucg" as cycle2;
\ No newline at end of file
+let cycle2 = import "import_cycle2.ucg";
\ No newline at end of file
diff --git a/example_errors/import_cycle2.ucg b/example_errors/import_cycle2.ucg
index 48a90e7..542e038 100644
--- a/example_errors/import_cycle2.ucg
+++ b/example_errors/import_cycle2.ucg
@@ -1 +1 @@
-import "import_cycle3.ucg" as cycle3;
\ No newline at end of file
+let cycle3 = import "import_cycle3.ucg";
\ No newline at end of file
diff --git a/example_errors/import_cycle3.ucg b/example_errors/import_cycle3.ucg
index 5e2b4c4..cfa7631 100644
--- a/example_errors/import_cycle3.ucg
+++ b/example_errors/import_cycle3.ucg
@@ -1 +1 @@
-import "import_cycle1.ucg" as cycle1;
\ No newline at end of file
+let cycle1 = import "import_cycle1.ucg";
\ No newline at end of file
diff --git a/src/build/mod.rs b/src/build/mod.rs
index 172ffa1..57f2ce9 100644
--- a/src/build/mod.rs
+++ b/src/build/mod.rs
@@ -465,6 +465,10 @@ impl<'a> FileBuilder<'a> {
             Some(v) => v.clone(),
             None => {
                 let mut b = self.clone_builder();
+                b.scope
+                    .import_stack
+                    .push(normalized.to_string_lossy().to_string());
+
                 match b.build(&normalized) {
                     Ok(_) => b.get_outputs_as_val(),
                     Err(e) => {