Sean/typed core fn

.envrc

@@ -0,0 +1 @@
+use nix

cabal.project

@@ -1,2 +1,14 @@
+repository cardano-haskell-packages
+  url: https://input-output-hk.github.io/cardano-haskell-packages
+  secure: True
+  root-keys:
+    3e0cce471cf09815f930210f7827266fd09045445d65923e6d0238a6cd15126f
+    443abb7fb497a134c343faf52f0b659bd7999bc06b7f63fa76dc99d631f9bea1
+    a86a1f6ce86c449c46666bda44268677abf29b5b2d2eb5ec7af903ec2f117a82
+    bcec67e8e99cabfa7764d75ad9b158d72bfacf70ca1d0ec8bc6b4406d1bf8413
+    c00aae8461a256275598500ea0e187588c35a5d5d7454fb57eac18d9edb86a56
+    d4a35cd3121aa00d18544bb0ac01c3e1691d618f462c46129271bccf39f7e8ee
+
+
 packages:
   purescript.cabal

hie.yaml

@@ -0,0 +1,43 @@
+cradle:
+  cabal:
+    - path: "src"
+      component: "lib:purescript"
+
+    - path: "app/Main.hs"
+      component: "purescript:exe:purs"
+
+    - path: "app/Command/Bundle.hs"
+      component: "purescript:exe:purs"
+
+    - path: "app/Command/Compile.hs"
+      component: "purescript:exe:purs"
+
+    - path: "app/Command/Docs.hs"
+      component: "purescript:exe:purs"
+
+    - path: "app/Command/Docs/Html.hs"
+      component: "purescript:exe:purs"
+
+    - path: "app/Command/Docs/Markdown.hs"
+      component: "purescript:exe:purs"
+
+    - path: "app/Command/Graph.hs"
+      component: "purescript:exe:purs"
+
+    - path: "app/Command/Hierarchy.hs"
+      component: "purescript:exe:purs"
+
+    - path: "app/Command/Ide.hs"
+      component: "purescript:exe:purs"
+
+    - path: "app/Command/Publish.hs"
+      component: "purescript:exe:purs"
+
+    - path: "app/Command/REPL.hs"
+      component: "purescript:exe:purs"
+
+    - path: "app/Version.hs"
+      component: "purescript:exe:purs"
+
+    - path: "tests"
+      component: "purescript:test:tests"

purescript.cabal

@@ -1,4 +1,4 @@
-cabal-version:  2.4
+cabal-version:  3.0
 
 name:           purescript
 -- Note: don't add prerelease identifiers here! Add them in app/Version.hs and npm-package/package.json instead.
@@ -34,7 +34,7 @@ extra-source-files:
   tests/support/pscide/src/**/*.purs
   tests/support/pscide/src/**/*.js
   tests/support/pscide/src/**/*.fail
-  stack.yaml
+  -- stack.yaml
   README.md
   INSTALL.md
   CONTRIBUTORS.md
@@ -157,7 +157,7 @@ common defaults
     aeson-better-errors >=0.9.1.1 && <0.10,
     ansi-terminal >=0.11.3 && <0.12,
     array >=0.5.4.0 && <0.6,
-    base >=4.16.2.0 && <4.17,
+    base >=4.16.2.0 && <4.18,
     blaze-html >=0.9.1.2 && <0.10,
     bower-json >=1.1.0.0 && <1.2,
     boxes >=0.1.5 && <0.2,
@@ -191,6 +191,7 @@ common defaults
     parsec >=3.1.15.0 && <3.2,
     pattern-arrows >=0.0.2 && <0.1,
     process ==1.6.13.1,
+    pretty-simple,
     protolude >=0.3.1 && <0.4,
     regex-tdfa >=1.3.1.2 && <1.4,
     safe >=0.3.19 && <0.4,
@@ -201,14 +202,16 @@ common defaults
     stm >=2.5.0.2 && <2.6,
     stringsearch >=0.3.6.6 && <0.4,
     template-haskell >=2.18.0.0 && <2.19,
-    text >=1.2.5.0 && <1.3,
+    text >=1.2.5.0 && <2.3,
     these >=1.1.1.1 && <1.2,
     time >=1.11.1.1 && <1.12,
     transformers >=0.5.6.2 && <0.6,
     transformers-base >=0.4.6 && <0.5,
     utf8-string >=1.0.2 && <1.1,
     vector >=0.12.3.1 && <0.13,
-    witherable >=0.4.2 && <0.5
+    witherable >=0.4.2 && <0.5,
+    plutus-core,
+    plutus-core:plutus-ir
 
 library
   import: defaults
@@ -230,21 +233,20 @@ library
     Language.PureScript.AST.Utils
     Language.PureScript.Bundle
     Language.PureScript.CodeGen
-    Language.PureScript.CodeGen.JS
-    Language.PureScript.CodeGen.JS.Common
-    Language.PureScript.CodeGen.JS.Printer
+    Language.PureScript.CodeGen.UPLC
     Language.PureScript.Constants.Libs
     Language.PureScript.CoreFn
     Language.PureScript.CoreFn.Ann
     Language.PureScript.CoreFn.Binders
     Language.PureScript.CoreFn.CSE
     Language.PureScript.CoreFn.Desugar
+    Language.PureScript.CoreFn.Desugar.Utils
     Language.PureScript.CoreFn.Expr
     Language.PureScript.CoreFn.FromJSON
-    Language.PureScript.CoreFn.Laziness
     Language.PureScript.CoreFn.Meta
     Language.PureScript.CoreFn.Module
     Language.PureScript.CoreFn.Optimizer
+    Language.PureScript.CoreFn.Pretty
     Language.PureScript.CoreFn.ToJSON
     Language.PureScript.CoreFn.Traversals
     Language.PureScript.CoreImp

shell.nix

@@ -0,0 +1,21 @@
+with (import <nixpkgs> {});
+let haskell928 = haskell.packages.ghc928;
+    ghc928 = haskell.compiler.ghc928;
+in mkShell {
+  nativeBuildInputs = [
+    pkg-config
+    haskell928.haskell-language-server
+    ghc928
+    cabal-install
+  ];
+
+  buildInputs = [
+    zlib
+    libsodium
+    secp256k1
+  ];
+
+  shellHook = ''
+    export LC_ALL=C.utf8
+  '';
+}

src/Language/PureScript/AST/Literals.hs

@@ -6,6 +6,9 @@ module Language.PureScript.AST.Literals where
 import Prelude
 import Language.PureScript.PSString (PSString)
 
+-- For serializing/deserializing Typed CoreFn
+import GHC.Generics ( Generic )
+import Data.Aeson (FromJSON, ToJSON)
 -- |
 -- Data type for literal values. Parameterised so it can be used for Exprs and
 -- Binders.
@@ -35,4 +38,7 @@ data Literal a
   -- An object literal
   --
   | ObjectLiteral [(PSString, a)]
-  deriving (Eq, Ord, Show, Functor)
+  deriving (Eq, Ord, Show, Functor, Generic)
+
+instance FromJSON a => FromJSON (Literal a)
+instance ToJSON a => ToJSON (Literal a)

src/Language/PureScript/CodeGen.hs

@@ -5,4 +5,4 @@
 --
 module Language.PureScript.CodeGen (module C) where
 
-import Language.PureScript.CodeGen.JS as C
+import Language.PureScript.CodeGen.UPLC as C