chore: s/DeadCodeEliminator/DCE/

Unisay · Apr 17, 2024 · 4ad858c · 4ad858c
1 parent 965d1fe
commit 4ad858c
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 17 deletions.
diff --git a/lib/Language/PureScript/Backend/Lua.hs b/lib/Language/PureScript/Backend/Lua.hs
@@ -244,7 +244,6 @@ fromIR foreigns topLevelNames modname ir = case ir of
  Oops.hoistEither =<< liftIO do
  left LinkerErrorForeign
  <$> Foreign.parseForeignSource (untag foreigns) path
- let foreignHeader = Lua.ForeignSourceStat <$> header
  let foreignExports ∷ Lua.Exp =
  Lua.table
  [ Lua.tableRowNV name (Lua.ForeignSourceExp src)
@@ -254,9 +253,9 @@ fromIR foreigns topLevelNames modname ir = case ir of
  let name = Key.toSafeName key
  , name `elem` fmap snd foreignNames
  ]
- pure case foreignHeader of
+ pure case header of
  Nothing → Right foreignExports
- Just fh → Left (fh : [Lua.return foreignExports])
+ Just fh → Left $ Lua.ForeignSourceStat fh : [Lua.return foreignExports]
  where
  go ∷ IR.Exp → LuaM e (Either Lua.Chunk Lua.Exp)
  go = fromIR foreigns topLevelNames modname

diff --git a/...eScript/Backend/Lua/DeadCodeEliminator.hs → lib/Language/PureScript/Backend/Lua/DCE.hs b/...eScript/Backend/Lua/DeadCodeEliminator.hs → lib/Language/PureScript/Backend/Lua/DCE.hs
@@ -1,4 +1,4 @@
-module Language.PureScript.Backend.Lua.DeadCodeEliminator where
+module Language.PureScript.Backend.Lua.DCE where
 
 import Control.Monad.Trans.Accum (add, execAccum)
 import Data.DList (DList)
@@ -63,13 +63,13 @@ eliminateDeadCode dceMode chunk = do
  guard (Set.member vertex reachableVertices) $> preserved
 
  dceExpression ∷ ANode Lua.ExpF → ANode Lua.ExpF
- dceExpression indexedExp@(Node key scope, expr) =
+ dceExpression originalExpr@(Node key scope, expr) =
  case expr of
- Lua.Nil → indexedExp
- Lua.Boolean _bool → indexedExp
- Lua.Integer _int → indexedExp
- Lua.Float _double → indexedExp
- Lua.String _text → indexedExp
+ Lua.Nil → originalExpr
+ Lua.Boolean _bool → originalExpr
+ Lua.Integer _int → originalExpr
+ Lua.Float _double → originalExpr
+ Lua.String _text → originalExpr
  Lua.Function params body →
  dce (Lua.Function (dceParams params) (dceChunk body))
  Lua.TableCtor rows →
@@ -83,7 +83,7 @@ eliminateDeadCode dceMode chunk = do
  Lua.FunctionCall e es →
  dce (Lua.FunctionCall (dceExpression e) (dceExpression <$> es))
  Lua.ForeignSourceExp _src →
- indexedExp
+ originalExpr
  where
  dce = (Node key scope,)
 

diff --git a/pslua.cabal b/pslua.cabal
@@ -132,7 +132,7 @@ library
  Language.PureScript.Backend.IR.Query
  Language.PureScript.Backend.IR.Types
  Language.PureScript.Backend.Lua
- Language.PureScript.Backend.Lua.DeadCodeEliminator
+ Language.PureScript.Backend.Lua.DCE
  Language.PureScript.Backend.Lua.Fixture
  Language.PureScript.Backend.Lua.Key
  Language.PureScript.Backend.Lua.Linker.Foreign
@@ -166,7 +166,7 @@ test-suite spec
  Language.PureScript.Backend.IR.Optimizer.Spec
  Language.PureScript.Backend.IR.Spec
  Language.PureScript.Backend.IR.Types.Spec
- Language.PureScript.Backend.Lua.DeadCodeEliminator.Spec
+ Language.PureScript.Backend.Lua.DCE.Spec
  Language.PureScript.Backend.Lua.Gen
  Language.PureScript.Backend.Lua.Golden.Spec
  Language.PureScript.Backend.Lua.Linker.Foreign.Spec

diff --git a/...pt/Backend/Lua/DeadCodeEliminator/Spec.hs → ...nguage/PureScript/Backend/Lua/DCE/Spec.hs b/...pt/Backend/Lua/DeadCodeEliminator/Spec.hs → ...nguage/PureScript/Backend/Lua/DCE/Spec.hs
@@ -1,17 +1,17 @@
 {-# LANGUAGE QuasiQuotes #-}
 
-module Language.PureScript.Backend.Lua.DeadCodeEliminator.Spec where
+module Language.PureScript.Backend.Lua.DCE.Spec where
 
 import Control.Monad.Accum (add)
 import Control.Monad.Trans.Accum (Accum, execAccum)
 import Hedgehog (annotateShow, forAll, (===))
 import Hedgehog.Gen qualified as Gen
 import Hedgehog.Range qualified as Range
-import Language.PureScript.Backend.Lua.DeadCodeEliminator
+import Language.PureScript.Backend.Lua.DCE
  ( DceMode (PreserveReturned)
  , MonadScopes (..)
  )
-import Language.PureScript.Backend.Lua.DeadCodeEliminator qualified as DCE
+import Language.PureScript.Backend.Lua.DCE qualified as DCE
 import Language.PureScript.Backend.Lua.Fixture qualified as Fixture
 import Language.PureScript.Backend.Lua.Gen qualified as Gen
 import Language.PureScript.Backend.Lua.Name qualified as Lua

diff --git a/test/Main.hs b/test/Main.hs
@@ -5,7 +5,7 @@ import Language.PureScript.Backend.IR.Inliner.Spec qualified as Inliner
 import Language.PureScript.Backend.IR.Optimizer.Spec qualified as IROptimizer
 import Language.PureScript.Backend.IR.Spec qualified as IR
 import Language.PureScript.Backend.IR.Types.Spec qualified as Types
-import Language.PureScript.Backend.Lua.DeadCodeEliminator.Spec qualified as LuaDce
+import Language.PureScript.Backend.Lua.DCE.Spec qualified as LuaDce
 import Language.PureScript.Backend.Lua.Golden.Spec qualified as Golden
 import Language.PureScript.Backend.Lua.Linker.Foreign.Spec qualified as LuaLinkerForeign
 import Language.PureScript.Backend.Lua.Optimizer.Spec qualified as LuaOptimizer