refactor for PR #1420

anoma · Sep 23, 2022 · e001886 · e001886
1 parent c8c240c
commit e001886
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 27 deletions.
diff --git a/src/Juvix/Asm/Data/InfoTable.hs → src/Juvix/Compiler/Asm/Data/InfoTable.hs b/src/Juvix/Asm/Data/InfoTable.hs → src/Juvix/Compiler/Asm/Data/InfoTable.hs
@@ -1,6 +1,6 @@
-module Juvix.Asm.Data.InfoTable where
+module Juvix.Compiler.Asm.Data.InfoTable where
 
-import Juvix.Asm.Language
+import Juvix.Compiler.Asm.Language
 
 data InfoTable = InfoTable
   { _infoFunctions :: HashMap Symbol FunctionInfo,

diff --git a/...Asm/Translation/Extra/InfoTableBuilder.hs → ...vix/Compiler/Asm/Data/InfoTableBuilder.hs b/...Asm/Translation/Extra/InfoTableBuilder.hs → ...vix/Compiler/Asm/Data/InfoTableBuilder.hs
@@ -1,8 +1,8 @@
-module Juvix.Asm.Translation.Extra.InfoTableBuilder where
+module Juvix.Compiler.Asm.Data.InfoTableBuilder where
 
 import Data.HashMap.Strict qualified as HashMap
-import Juvix.Asm.Data.InfoTable
-import Juvix.Asm.Language
+import Juvix.Compiler.Asm.Data.InfoTable
+import Juvix.Compiler.Asm.Language
 
 data InfoTableBuilder m a where
   RegisterFunction :: FunctionInfo -> InfoTableBuilder m ()

diff --git a/src/Juvix/Asm/Interpreter.hs → src/Juvix/Compiler/Asm/Interpreter.hs b/src/Juvix/Asm/Interpreter.hs → src/Juvix/Compiler/Asm/Interpreter.hs
@@ -1,11 +1,11 @@
-module Juvix.Asm.Interpreter where
+module Juvix.Compiler.Asm.Interpreter where
 
 import Control.Monad
 import Data.HashMap.Strict qualified as HashMap
-import Juvix.Asm.Data.InfoTable
-import Juvix.Asm.Interpreter.Extra
-import Juvix.Asm.Interpreter.Runtime
-import Juvix.Asm.Language
+import Juvix.Compiler.Asm.Data.InfoTable
+import Juvix.Compiler.Asm.Interpreter.Extra
+import Juvix.Compiler.Asm.Interpreter.Runtime
+import Juvix.Compiler.Asm.Language
 
 -- The returned Val is the value on top of the value stack at exit, i.e., when
 -- executing a toplevel Return. Throws a runtime error if at exit the value

diff --git a/src/Juvix/Asm/Interpreter/Extra.hs → src/Juvix/Compiler/Asm/Interpreter/Extra.hs b/src/Juvix/Asm/Interpreter/Extra.hs → src/Juvix/Compiler/Asm/Interpreter/Extra.hs
@@ -1,8 +1,8 @@
-module Juvix.Asm.Interpreter.Extra where
+module Juvix.Compiler.Asm.Interpreter.Extra where
 
 import Data.HashMap.Strict qualified as HashMap
-import Juvix.Asm.Data.InfoTable
-import Juvix.Asm.Interpreter.Runtime
+import Juvix.Compiler.Asm.Data.InfoTable
+import Juvix.Compiler.Asm.Interpreter.Runtime
 import Juvix.Prelude
 
 frameFromFunctionInfo :: FunctionInfo -> [Val] -> Frame

diff --git a/src/Juvix/Asm/Interpreter/Runtime.hs → ...Juvix/Compiler/Asm/Interpreter/Runtime.hs b/src/Juvix/Asm/Interpreter/Runtime.hs → ...Juvix/Compiler/Asm/Interpreter/Runtime.hs
@@ -1,7 +1,7 @@
-module Juvix.Asm.Interpreter.Runtime where
+module Juvix.Compiler.Asm.Interpreter.Runtime where
 
 import Data.HashMap.Strict qualified as HashMap
-import Juvix.Asm.Language
+import Juvix.Compiler.Asm.Language
 
 {-
 Memory consists of:

diff --git a/src/Juvix/Asm/Language.hs → src/Juvix/Compiler/Asm/Language.hs b/src/Juvix/Asm/Language.hs → src/Juvix/Compiler/Asm/Language.hs
@@ -2,13 +2,13 @@
 {-# OPTIONS_GHC -Wno-unrecognised-pragmas #-}
 
 {-# HLINT ignore "Avoid restricted flags" #-}
-module Juvix.Asm.Language
-  ( module Juvix.Asm.Language,
-    module Juvix.Core.Language.Base,
+module Juvix.Compiler.Asm.Language
+  ( module Juvix.Compiler.Asm.Language,
+    module Juvix.Compiler.Core.Language.Base,
   )
 where
 
-import Juvix.Core.Language.Base
+import Juvix.Compiler.Core.Language.Base
 
 {-
 A JuvixAsm program is a set of JuvixAsm functions. Every function has an

diff --git a/src/Juvix/Asm/Translation/FromCore.hs → ...uvix/Compiler/Asm/Translation/FromCore.hs b/src/Juvix/Asm/Translation/FromCore.hs → ...uvix/Compiler/Asm/Translation/FromCore.hs
@@ -1,14 +1,14 @@
-module Juvix.Asm.Translation.FromCore where
+module Juvix.Compiler.Asm.Translation.FromCore where
 
 import Data.DList qualified as DL
 import Data.HashMap.Strict qualified as HashMap
-import Juvix.Asm.Language
-import Juvix.Core.Data.BinderList qualified as BL
-import Juvix.Core.Data.InfoTable qualified as Core
-import Juvix.Core.Extra qualified as Core
-import Juvix.Core.Language qualified as Core
-import Juvix.Core.Language.Info qualified as Info
-import Juvix.Core.Language.Info.ArgsNumInfo
+import Juvix.Compiler.Asm.Language
+import Juvix.Compiler.Core.Data.BinderList qualified as BL
+import Juvix.Compiler.Core.Data.InfoTable qualified as Core
+import Juvix.Compiler.Core.Extra qualified as Core
+import Juvix.Compiler.Core.Language qualified as Core
+import Juvix.Compiler.Core.Language.Info qualified as Info
+import Juvix.Compiler.Core.Language.Info.ArgsNumInfo
 
 type BinderList = BL.BinderList