fix after merge

anoma · Dec 15, 2023 · b871ffb · b871ffb
1 parent cf07146
commit b871ffb
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/src/Juvix/Compiler/Asm/Extra/Apply.hs b/src/Juvix/Compiler/Asm/Extra/Apply.hs
@@ -20,13 +20,13 @@ makeLenses ''ApplyBuiltins
 addApplyBuiltins :: InfoTable -> (ApplyBuiltins, InfoTable)
 addApplyBuiltins tab = (blts, bs' ^. stateInfoTable)
   where
-    nextSymbol = maximum (0 : HashMap.keys (tab ^. infoFunctions) ++ HashMap.keys (tab ^. infoInductives)) + 1
-    nextUserId = maximum (0 : mapMaybe getUserTag (HashMap.keys (tab ^. infoConstrs))) + 1
+    nextSymbolId = maximum (0 : map (^. symbolId) (HashMap.keys (tab ^. infoFunctions) ++ HashMap.keys (tab ^. infoInductives))) + 1
+    nextUserId = maximum (0 : mapMaybe getUserTagId (HashMap.keys (tab ^. infoConstrs))) + 1
 
     bs :: BuilderState
     bs =
       BuilderState
-        { _stateNextSymbol = nextSymbol,
+        { _stateNextSymbolId = nextSymbolId,
           _stateNextUserTag = nextUserId,
           _stateInfoTable = tab,
           _stateIdents = mempty
@@ -53,8 +53,3 @@ addApplyBuiltins tab = (blts, bs' ^. stateInfoTable)
         f = case fromJust $ HashMap.lookup idt (bs' ^. stateIdents) of
           IdentFun s -> s
           _ -> impossible
-
-    getUserTag :: Tag -> Maybe Word
-    getUserTag = \case
-      BuiltinTag {} -> Nothing
-      UserTag x -> Just x
diff --git a/src/Juvix/Compiler/Asm/Translation/FromSource.hs b/src/Juvix/Compiler/Asm/Translation/FromSource.hs
@@ -39,9 +39,11 @@ runParser fileName input = (^. stateInfoTable) <$> runParser' emptyBuilderState
 runParser' :: BuilderState -> FilePath -> Text -> Either MegaparsecError BuilderState
 runParser' bs fileName input =
   case run $
-    runInfoTableBuilder' bs $
-      evalTopNameIdGen defaultModuleId $
-        P.runParserT parseToplevel fileName input of
+    evalState @Index 0 $
+      evalState @LocalNameMap mempty $
+        runInfoTableBuilder' bs $
+          evalTopNameIdGen defaultModuleId $
+            P.runParserT parseToplevel fileName input of
     (_, Left err) -> Left (MegaparsecError err)
     (bs', Right ()) -> Right bs'
 

diff --git a/src/Juvix/Compiler/Core/Data/InfoTable/Base.hs b/src/Juvix/Compiler/Core/Data/InfoTable/Base.hs
@@ -58,6 +58,7 @@ data ConstructorInfo' n = ConstructorInfo
     _constructorTag :: Tag,
     _constructorType :: n,
     _constructorArgsNum :: Int,
+    _constructorArgNames :: [Maybe Text],
     _constructorInductive :: Symbol,
     _constructorFixity :: Maybe Fixity,
     _constructorBuiltin :: Maybe BuiltinConstructor,