Merge pull request #183 from EpitechPromo2027/182-relative-imports-do…

…-not-work fix: relative imports are now relative to `SourceFile`
Jabolol · Jan 13, 2025 · 97ea3be · 97ea3be
2 parents c08307b + 7300767
commit 97ea3be
Show file tree

Hide file tree

Showing 9 changed files with 37 additions and 26 deletions.
diff --git a/examples/array.ff b/examples/array.ff
@@ -1,5 +1,15 @@
-printf: foreign *byte ... -> int
+%%
+% Hello world with arguments
+%%
 
+%%
+% Standard Library
+%%
+import "std/io.ff"
+
+%%
+% Main function
+%%
 main: int **byte -> int = argc argv {
     printf("Hello, %s!\n" argv.#(argc - 1))
 }
diff --git a/examples/hello.ff b/examples/hello.ff
@@ -5,7 +5,7 @@
 %%
 % Standard Library
 %%
-import "./examples/std/io.ff"
+import "std/io.ff"
 
 %%
 % Main function

diff --git a/examples/julia.ff b/examples/julia.ff
@@ -5,9 +5,9 @@
 %%
 % Standard Library
 %%
-import "./examples/std/io.ff"
-import "./examples/std/math.ff"
-import "./examples/std/uni.ff"
+import "std/io.ff"
+import "std/math.ff"
+import "std/uni.ff"
 
 %%
 % Function to clear the screen

diff --git a/examples/mandelbrot.ff b/examples/mandelbrot.ff
@@ -5,7 +5,7 @@
 %%
 % Standard Library
 %%
-import "./examples/std/io.ff"
+import "std/io.ff"
 
 %%
 % Function to render the Mandelbrot set

diff --git a/examples/putstr.ff b/examples/putstr.ff
@@ -5,9 +5,9 @@
 %%
 % Standard Library
 %%
-import "./examples/std/io.ff"
-import "./examples/std/string.ff"
-import "./examples/std/uni.ff"
+import "std/io.ff"
+import "std/string.ff"
+import "std/uni.ff"
 
 %%
 % Function to write a string to stdout

diff --git a/examples/sierpinski.ff b/examples/sierpinski.ff
@@ -5,7 +5,7 @@
 %%
 % Standard Library
 %%
-import "./examples/std/io.ff"
+import "std/io.ff"
 
 %%
 % Draw the Sierpinski Triangle

diff --git a/examples/sine.ff b/examples/sine.ff
@@ -5,9 +5,9 @@
 %%
 % Standard Library
 %%
-import "./examples/std/io.ff"
-import "./examples/std/math.ff"
-import "./examples/std/uni.ff"
+import "std/io.ff"
+import "std/math.ff"
+import "std/uni.ff"
 
 %%
 % Function to draw the sine wave

diff --git a/lib/Ast/Parser/Import.hs b/lib/Ast/Parser/Import.hs
@@ -8,10 +8,11 @@ import qualified Data.ByteString.Char8 as BS
 import qualified Data.CaseInsensitive as CI
 import qualified Network.HTTP.Simple as N
 import qualified System.Environment as E
+import qualified System.IO.Error as IOE
 import qualified Text.Megaparsec as M
 
-parseImport :: PU.Parser String -> PU.Parser String
-parseImport p = do
+parseImport :: String -> PU.Parser String -> PU.Parser String
+parseImport sourceFile p = do
   import' <- PU.symbol "import" *> M.between (PU.symbol "\"") (PU.symbol "\"") (M.some $ M.anySingleBut '\"')
   state <- S.get
   let visited = PS.lookupImport import' state
@@ -25,9 +26,7 @@ parseImport p = do
         else do
           S.modify $ PS.insertImport import'
           S.modify $ PS.setImportDepth $ depth + 1
-          source <- case import' of
-            ('.' : _) -> IO.liftIO $ localImport import'
-            _ -> IO.liftIO $ externalImport import'
+          source <- IO.liftIO $ IOE.catchIOError (localImport sourceFile import') (\_ -> externalImport import')
           input <- M.getInput
           M.setInput $ source ++ input
           source' <- p
@@ -36,8 +35,10 @@ parseImport p = do
   where
     maxDepth = 25
 
-localImport :: String -> IO String
-localImport = readFile
+localImport :: String -> String -> IO String
+localImport sourceFile import' = readFile $ dir sourceFile ++ import'
+  where
+    dir = reverse . dropWhile (/= '/') . reverse
 
 externalImport :: String -> IO String
 externalImport url = do
@@ -46,7 +47,7 @@ externalImport url = do
     Just token ->
       N.setRequestHeaders
         [(CI.mk $ BS.pack "Authorization", BS.pack $ "Bearer " ++ token)]
-        <$> N.parseRequest url
-    Nothing -> N.parseRequest url
+        <$> N.parseRequestThrow url
+    Nothing -> N.parseRequestThrow url
   res <- N.httpBS req
   return $ BS.unpack $ N.getResponseBody res
diff --git a/lib/Ast/Parser/Program.hs b/lib/Ast/Parser/Program.hs
@@ -13,14 +13,14 @@ parseProgram :: String -> PU.Parser AT.Program
 parseProgram sourceFile = do
   _ <- PU.sc
   S.modify $ PS.insertImport sourceFile
-  source <- preprocess
+  source <- preprocess sourceFile
   M.setInput source
   components <- M.many $ M.choice [M.try parseTypeDefinition, parseExpr]
   return $ AT.Program (concatMap AT.globals components) (concatMap AT.types components) sourceFile
 
-preprocess :: PU.Parser String
-preprocess = do
-  sources <- M.many $ M.choice [PI.parseImport preprocess, (: []) <$> M.anySingle]
+preprocess :: String -> PU.Parser String
+preprocess sourceFile = do
+  sources <- M.many $ M.choice [PI.parseImport sourceFile (preprocess sourceFile), (: []) <$> M.anySingle]
   return $ concat sources
 
 parseTypeDefinition :: PU.Parser AT.Program