Do not duplicate nockma stdlib in the nockma backend (#3005)

anoma · Sep 9, 2024 · f47b9b0 · f47b9b0
1 parent 372375e
commit f47b9b0
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 2 deletions.
diff --git a/src/Juvix/Compiler/Nockma/Language.hs b/src/Juvix/Compiler/Nockma/Language.hs
@@ -122,6 +122,7 @@ data AtomHint
   | AtomHintNil
   | AtomHintVoid
   | AtomHintFunctionsPlaceholder
+  | AtomHintStdlibPlaceholder
   | AtomHintString
   deriving stock (Show, Eq, Lift, Generic)
 

diff --git a/src/Juvix/Compiler/Nockma/Pretty/Base.hs b/src/Juvix/Compiler/Nockma/Pretty/Base.hs
@@ -44,6 +44,7 @@ instance forall a. (PrettyCode a, NockNatural a) => PrettyCode (Atom a) where
           AtomHintNil -> return (annotate (AnnKind KNameConstructor) Str.nil)
           AtomHintVoid -> return (annotate (AnnKind KNameAxiom) Str.void)
           AtomHintFunctionsPlaceholder -> return (annotate (AnnKind KNameAxiom) Str.functionsPlaceholder)
+          AtomHintStdlibPlaceholder -> return (annotate (AnnKind KNameAxiom) Str.stdlibPlaceholder)
           AtomHintString -> atomToText atm >>= ppCode
 
 instance PrettyCode Text where

diff --git a/src/Juvix/Compiler/Nockma/Translation/FromTree.hs b/src/Juvix/Compiler/Nockma/Translation/FromTree.hs
@@ -690,7 +690,7 @@ compile = \case
         FunctionsLibrary -> OpQuote # functionsLibraryPlaceHolder
         RawCode -> opAddress "allocClosureFunPath" (fpath <> closurePath RawCode)
         TempStack -> remakeList []
-        StandardLibrary -> OpQuote # stdlib
+        StandardLibrary -> OpQuote # stdlibPlaceHolder
         ClosureTotalArgsNum -> nockNatLiteral farity
         ClosureArgsNum -> nockIntegralLiteral (length args)
         ClosureArgs -> remakeList args
@@ -958,7 +958,7 @@ runCompilerWith opts constrs moduleFuns mainFun = makeAnomaFun
                     FunctionsLibrary -> ("functionsLibrary-" <> funName) @ functionsLibraryPlaceHolder
                     RawCode -> ("rawCode-" <> funName) @ c
                     TempStack -> ("tempStack-" <> funName) @ nockNilHere
-                    StandardLibrary -> ("stdlib-" <> funName) @ stdlib
+                    StandardLibrary -> ("stdlib-" <> funName) @ stdlibPlaceHolder
                     ClosureTotalArgsNum -> ("closureTotalArgsNum-" <> funName) @ nockNilHere
                     ClosureArgsNum -> ("closureArgsNum-" <> funName) @ nockNilHere
                     ClosureArgs -> ("closureArgs-" <> funName) @ nockNilHere
@@ -1001,6 +1001,19 @@ runCompilerWith opts constrs moduleFuns mainFun = makeAnomaFun
         { _anomaClosure = mainClosure
         }
 
+stdlibPlaceHolder :: Term Natural
+stdlibPlaceHolder =
+  TermAtom
+    Atom
+      { _atomInfo =
+          AtomInfo
+            { _atomInfoLoc = Irrelevant Nothing,
+              _atomInfoTag = Nothing,
+              _atomInfoHint = Just AtomHintStdlibPlaceholder
+            },
+        _atom = 0 :: Natural
+      }
+
 functionsLibraryPlaceHolder :: Term Natural
 functionsLibraryPlaceHolder =
   TermAtom

diff --git a/src/Juvix/Extra/Strings.hs b/src/Juvix/Extra/Strings.hs
@@ -1022,6 +1022,9 @@ version = "version"
 functionsPlaceholder :: (IsString s) => s
 functionsPlaceholder = "functionsLibrary_placeholder"
 
+stdlibPlaceholder :: (IsString s) => s
+stdlibPlaceholder = "stdlib_placeholder"
+
 theFunctionsLibrary :: (IsString s) => s
 theFunctionsLibrary = "the_functionsLibrary"