changes for review

anoma · Apr 14, 2023 · 6fd4521 · 6fd4521
1 parent ada6f9a
commit 6fd4521
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 13 deletions.
diff --git a/src/Juvix/Compiler/Asm/Translation/FromCore.hs b/src/Juvix/Compiler/Asm/Translation/FromCore.hs
@@ -137,21 +137,24 @@ genCode infoTable fi =
     goBuiltinApp isTail tempSize refs (Core.BuiltinApp {..}) =
       case _builtinAppOp of
         OpSeq ->
-          case _builtinAppArgs of
-            [arg1, arg2] ->
-              DL.append
-                (go False tempSize refs arg1)
-                ( DL.cons
-                    (mkInstr Pop)
-                    (go isTail tempSize refs arg2)
-                )
-            _ -> impossible
+          goSeq isTail tempSize refs _builtinAppArgs
         _ ->
           snocReturn isTail $
             DL.append
               (DL.concat (map (go False tempSize refs) (reverse _builtinAppArgs)))
               (genOp _builtinAppOp)
 
+    goSeq :: Bool -> Int -> BinderList Value -> [Core.Node] -> Code'
+    goSeq isTail tempSize refs = \case
+      [arg1, arg2] ->
+        DL.append
+          (go False tempSize refs arg1)
+          ( DL.cons
+              (mkInstr Pop)
+              (go isTail tempSize refs arg2)
+          )
+      _ -> impossible
+
     goConstr :: Bool -> Int -> BinderList Value -> Core.Constr -> Code'
     goConstr isTail tempSize refs = \case
       Core.Constr _ (Core.BuiltinTag Core.TagTrue) _ ->

diff --git a/src/Juvix/Compiler/Builtins/Bool.hs b/src/Juvix/Compiler/Builtins/Bool.hs
@@ -36,7 +36,7 @@ registerIf f = do
   true_ <- toExpression <$> getBuiltinName (getLoc f) BuiltinBoolTrue
   false_ <- toExpression <$> getBuiltinName (getLoc f) BuiltinBoolFalse
   let if_ = f ^. funDefName
-      u = ExpressionUniverse (Universe {_universeLevel = Nothing, _universeLoc = error "Universe with no location"})
+      u = ExpressionUniverse smallUniverseNoLoc
   vart <- freshVar "t"
   vare <- freshVar "e"
   hole <- freshHole

diff --git a/src/Juvix/Compiler/Builtins/Control.hs b/src/Juvix/Compiler/Builtins/Control.hs
@@ -6,7 +6,7 @@ import Juvix.Prelude
 
 registerSeq :: (Members '[Builtins, NameIdGen] r) => FunctionDef -> Sem r ()
 registerSeq f = do
-  let u = ExpressionUniverse (Universe {_universeLevel = Nothing, _universeLoc = error "Universe with no location"})
+  let u = ExpressionUniverse smallUniverseNoLoc
   a <- freshVar "a"
   b <- freshVar "b"
   let seq = f ^. funDefName

diff --git a/src/Juvix/Compiler/Builtins/Debug.hs b/src/Juvix/Compiler/Builtins/Debug.hs
@@ -8,7 +8,7 @@ import Juvix.Prelude
 registerTrace :: (Members '[Builtins, NameIdGen] r) => AxiomDef -> Sem r ()
 registerTrace f = do
   let ftype = f ^. axiomType
-      u = ExpressionUniverse (Universe {_universeLevel = Nothing, _universeLoc = error "Universe with no location"})
+      u = ExpressionUniverse smallUniverseNoLoc
   a <- freshVar "a"
   let freeVars = HashSet.fromList [a]
   unless
@@ -19,7 +19,7 @@ registerTrace f = do
 registerFail :: (Members '[Builtins, NameIdGen] r) => AxiomDef -> Sem r ()
 registerFail f = do
   let ftype = f ^. axiomType
-      u = ExpressionUniverse (Universe {_universeLevel = Nothing, _universeLoc = error "Universe with no location"})
+      u = ExpressionUniverse smallUniverseNoLoc
   a <- freshVar "a"
   let freeVars = HashSet.fromList [a]
   string_ <- getBuiltinName (getLoc f) BuiltinString

diff --git a/src/Juvix/Data/Universe.hs b/src/Juvix/Data/Universe.hs
@@ -41,6 +41,9 @@ smallUniverse = Universe (Just smallLevel)
 isSmallUniverse :: Universe -> Bool
 isSmallUniverse = (== smallLevel) . getUniverseLevel
 
+smallUniverseNoLoc :: Universe
+smallUniverseNoLoc = smallUniverse (error "Universe with no location")
+
 instance HasAtomicity Universe where
   atomicity u = case u ^. universeLevel of
     Nothing -> Atom