zaphar/ucg
1
0
Fork 0
mirror of https://github.com/zaphar/ucg.git synced 2025-07-21 18:10:42 -04:00
Code Issues Packages Projects Releases Wiki Activity

FIX: import cycle detection which was broken.

Browse Source
This commit is contained in:
Jeremy Wall 2019-03-28 20:38:02 -04:00
parent 76899cb481
commit 2e38a3486e
4 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
example_errors/import_cycle1.ucg
View File

@ -1 +1 @@
import "import_cycle2.ucg" as cycle2; let cycle2 = import "import_cycle2.ucg";

2
example_errors/import_cycle2.ucg
View File

@ -1 +1 @@
import "import_cycle3.ucg" as cycle3; let cycle3 = import "import_cycle3.ucg";

2
example_errors/import_cycle3.ucg
View File

@ -1 +1 @@
import "import_cycle1.ucg" as cycle1; let cycle1 = import "import_cycle1.ucg";

4
src/build/mod.rs
View File

@ -465,6 +465,10 @@ impl<'a> FileBuilder<'a> {
Some(v) => v.clone(), Some(v) => v.clone(),
None => { None => {
let mut b = self.clone_builder(); let mut b = self.clone_builder();
b.scope
.import_stack
.push(normalized.to_string_lossy().to_string());
match b.build(&normalized) { match b.build(&normalized) {
Ok(_) => b.get_outputs_as_val(), Ok(_) => b.get_outputs_as_val(),
Err(e) => { Err(e) => {