diff --git a/test/cases/imports.bqn b/test/cases/imports.bqn index 87d1c380..6955d736 100644 --- a/test/cases/imports.bqn +++ b/test/cases/imports.bqn @@ -1,12 +1,12 @@ %DEF file ( - path0 ← •path•file.At"../imports/" - File ← {path0 •file.At 𝕩} - CleanPath ← ! {r←•file.RealPath path0 ⋄ ≠i←/r ⍷ 𝕩? (⋈⁼i)(↑∾"..."∾(≠r)⊸+⊸↓)𝕩; 𝕩}∘•CurrentError∘@ + ⟨AtRoot, Import⟩ ← ⊑•args + File ← AtRoot + CleanPath ← ! {r←•file.RealPath AtRoot"" ⋄ ≠i←/r ⍷ 𝕩? (⋈⁼i)(↑∾"..."∾(≠r)⊸+⊸↓)𝕩; 𝕩}∘•CurrentError∘@ ) ( %USE file - f ← File "show.bqn" + f ← File "imports/show.bqn" r1 ← •Import f ⋄ ! +‿"show.bqn"‿⟨⟩ ≡ 1↓r1 r2 ← •Import f ⋄ ! +‿"show.bqn"‿⟨⟩ ≡ 1↓r2 ! r1 ≡○⊑ r2 @@ -17,11 +17,11 @@ ! (⊑¨r1‿r3) ≡ ⍷⊑¨r1‿r2‿r3‿r4 ) -!"•Import 𝕩: cyclic import of "".../cyclic.bqn""" % %USE file ⋄ •Import⎊CleanPath File "cyclic.bqn" -!"•Import 𝕩: cyclic import of "".../cyclic.bqn""" % %USE file ⋄ •Import⎊CleanPath File "cyclic.bqn" -!"•Import 𝕩: cyclic import of "".../cyclic.bqn""" % %USE file ⋄ ⟨⟩•Import⎊CleanPath File "cyclic.bqn" -!"•Import 𝕩: cyclic import of "".../cyclic_A.bqn""" % %USE file ⋄ •Import⎊CleanPath File "cyclic_A.bqn" -!"•Import 𝕩: cyclic import of "".../cyclic_B.bqn""" % %USE file ⋄ •Import⎊CleanPath File "cyclic_B.bqn" -!"•Import 𝕩: cyclic import of "".../cyclic_A.bqn""" % %USE file ⋄ ⟨⟩•Import⎊CleanPath File "cyclic_B.bqn" -!"•Import 𝕩: cyclic import of "".../cyclic_B.bqn""" % %USE file ⋄ ⟨⟩•Import⎊CleanPath File "cyclic_A.bqn" -%USE file ⋄ 3 •Import File "notCyclic.bqn" %% 30 +!"•Import 𝕩: cyclic import of "".../imports/cyclic.bqn""" % %USE file ⋄ Import⎊CleanPath "imports/cyclic.bqn" +!"•Import 𝕩: cyclic import of "".../imports/cyclic.bqn""" % %USE file ⋄ Import⎊CleanPath "imports/cyclic.bqn" +!"•Import 𝕩: cyclic import of "".../imports/cyclic.bqn""" % %USE file ⋄ ⟨⟩Import⎊CleanPath "imports/cyclic.bqn" +!"•Import 𝕩: cyclic import of "".../imports/cyclic_A.bqn""" % %USE file ⋄ Import⎊CleanPath "imports/cyclic_A.bqn" +!"•Import 𝕩: cyclic import of "".../imports/cyclic_B.bqn""" % %USE file ⋄ Import⎊CleanPath "imports/cyclic_B.bqn" +!"•Import 𝕩: cyclic import of "".../imports/cyclic_A.bqn""" % %USE file ⋄ ⟨⟩Import⎊CleanPath "imports/cyclic_B.bqn" +!"•Import 𝕩: cyclic import of "".../imports/cyclic_B.bqn""" % %USE file ⋄ ⟨⟩Import⎊CleanPath "imports/cyclic_A.bqn" +%USE file ⋄ 3 Import "imports/notCyclic.bqn" %% 30 diff --git a/test/run.bqn b/test/run.bqn index c5d0e17c..6cb6fa02 100644 --- a/test/run.bqn +++ b/test/run.bqn @@ -283,6 +283,7 @@ helpers ← { GetRand ⇐ {𝕊: •MakeRand (GetTestState@).rand.Range 1e9} + AtRoot ⇐ {𝕊: •file.At 𝕩} Import ⇐ {𝕊: 𝕨 •Import •file.At 𝕩} _eqvar ⇐ {𝔽 _eqvar0_ ListVariations}