Merge branch 'szg251/rust-codegen' of github.com:mlabs-haskell/lambda-buffers into szg251/rust-nix

Author: szg251

lambda-buffers-codegen/data/rust-plutus-pla.json

@@ -7,122 +7,146 @@
     ],
     "Plutus.V1.Address": [
       "plutus-ledger-api",
-      "v1::address",
+      "v1",
+      "address",
       "Address"
     ],
     "Plutus.V1.Credential": [
       "plutus-ledger-api",
-      "v1::address",
+      "v1",
+      "address",
       "Credential"
     ],
     "Plutus.V1.StakingCredential": [
       "plutus-ledger-api",
-      "v1::address",
+      "v1",
+      "address",
       "StakingCredential"
     ],
     "Plutus.V1.PubKeyHash": [
       "plutus-ledger-api",
-      "v1::crypto",
+      "v1",
+      "crypto",
       "Ed25519PubKeyHash"
     ],
     "Plutus.V1.Bytes": [
       "plutus-ledger-api",
-      "v1::crypto",
+      "v1",
+      "crypto",
       "LedgerBytes"
     ],
     "Plutus.V1.Interval": [
       "plutus-ledger-api",
-      "v1::interval",
+      "v1",
+      "interval",
       "Interval"
     ],
     "Plutus.V1.Extended": [
       "plutus-ledger-api",
-      "v1::interval",
+      "v1",
+      "interval",
       "Extended"
     ],
     "Plutus.V1.LowerBound": [
       "plutus-ledger-api",
-      "v1::interval",
+      "v1",
+      "interval",
       "LowerBound"
     ],
     "Plutus.V1.UpperBound": [
       "plutus-ledger-api",
-      "v1::interval",
+      "v1",
+      "interval",
       "UpperBound"
     ],
     "Plutus.V1.POSIXTime": [
       "plutus-ledger-api",
-      "v1::transaction",
+      "v1",
+      "transaction",
       "POSIXTime"
     ],
     "Plutus.V1.POSIXTimeRange": [
       "plutus-ledger-api",
-      "v1::transaction",
+      "v1",
+      "transaction",
       "POSIXTimeRange"
     ],
     "Plutus.V1.Value": [
       "plutus-ledger-api",
-      "v1::value",
+      "v1",
+      "value",
       "Value"
     ],
     "Plutus.V1.CurrencySymbol": [
       "plutus-ledger-api",
-      "v1::value",
+      "v1",
+      "value",
       "CurrencySymbol"
     ],
     "Plutus.V1.AssetClass": [
       "plutus-ledger-api",
-      "v1::value",
+      "v1",
+      "value",
       "AssetClass"
     ],
     "Plutus.V1.TokenName": [
       "plutus-ledger-api",
-      "v1::value",
+      "v1",
+      "value",
       "TokenName"
     ],
     "Plutus.V1.Redeemer": [
       "plutus-ledger-api",
-      "v1::redeemer",
+      "v1",
+      "redeemer",
       "Redeemer"
     ],
     "Plutus.V1.Datum": [
       "plutus-ledger-api",
-      "v1::datum",
+      "v1",
+      "datum",
       "Datum"
     ],
     "Plutus.V1.DatumHash": [
       "plutus-ledger-api",
-      "v1::datum",
+      "v1",
+      "datum",
       "DatumHash"
     ],
     "Plutus.V1.RedeemerHash": [
       "plutus-ledger-api",
-      "v1::redeemer",
+      "v1",
+      "redeemer",
       "RedeemerHash"
     ],
     "Plutus.V1.ScriptHash": [
       "plutus-ledger-api",
-      "v1::script",
+      "v1",
+      "script",
       "ScriptHash"
     ],
     "Plutus.V1.TxInInfo": [
       "plutus-ledger-api",
-      "v1::transaction",
+      "v1",
+      "transaction",
       "TxInInfo"
     ],
     "Plutus.V1.TxId": [
       "plutus-ledger-api",
-      "v1::transaction",
+      "v1",
+      "transaction",
       "TransactionHash"
     ],
     "Plutus.V1.TxOut": [
       "plutus-ledger-api",
-      "v1::transaction",
+      "v1",
+      "transaction",
       "TransactionOutput"
     ],
     "Plutus.V1.TxOutRef": [
       "plutus-ledger-api",
-      "v1::transaction",
+      "v1",
+      "transaction",
       "TransactionInput"
     ],
     "Plutus.V1.Map": [
@@ -132,17 +156,20 @@
     ],
     "Plutus.V2.TxInInfo": [
       "plutus-ledger-api",
-      "v1::transaction",
+      "v1",
+      "transaction",
       "TxInInfo"
     ],
     "Plutus.V2.OutputDatum": [
       "plutus-ledger-api",
-      "v2::datum",
+      "v2",
+      "datum",
       "OutputDatum"
     ],
     "Plutus.V2.TxOut": [
       "plutus-ledger-api",
-      "v2::transaction",
+      "v2",
+      "transaction",
       "TransactionOutput"
     ]
   },

lambda-buffers-codegen/data/rust-prelude-base.json

@@ -40,7 +40,6 @@
     ],
     "Prelude.Integer": [
       "num-bigint",
-      "",
       "BigInt"
     ],
     "Prelude.Bool": [

lambda-buffers-codegen/src/LambdaBuffers/Codegen/Rust/Config.hs

@@ -8,6 +8,7 @@ import Data.Map (Map)
 import Data.Map qualified as Map
 import Data.Text (Text)
 import Data.Vector qualified as Vector
+import Debug.Trace (trace)
 import LambdaBuffers.Codegen.Config qualified as Config
 import LambdaBuffers.Codegen.Rust.Print.Syntax qualified as R
 
@@ -27,19 +28,24 @@ instance FromJSON R.CrateName
 
 instance FromJSONKey R.CrateName
 
-instance (FromJSON a) => FromJSON (R.Qualified a) where
+instance FromJSON a => FromJSON (R.Qualified a) where
   parseJSON v = do
     A.withArray
       "Qualified"
       ( \arr -> do
           case Vector.toList arr of
+            [] -> fail "Cannot parse qualified entity, empty list is invalid"
             [a] -> R.Qualified'Builtin <$> parseJSON a
-            [cn, mn, a] -> R.Qualified'LibRef <$> parseJSON cn <*> parseJSON mn <*> parseJSON a
-            _ -> fail "Invalid Qualified"
+            cn : parts -> do
+              modules <- traverse parseJSON (init (trace (show parts) parts))
+              R.Qualified'LibRef
+                <$> parseJSON cn
+                <*> pure (map R.MkModuleName modules)
+                <*> parseJSON (last parts)
       )
       v
 
-instance (ToJSON a) => ToJSON (R.Qualified a) where
+instance ToJSON a => ToJSON (R.Qualified a) where
   toJSON (R.Qualified'LibRef cn mn a) = A.Array $ Vector.fromList [toJSON cn, toJSON mn, toJSON a]
   toJSON (R.Qualified'Builtin a) = A.Array $ Vector.fromList [toJSON a]
 

lambda-buffers-codegen/src/LambdaBuffers/Codegen/Rust/Print/Refs.hs

@@ -1,4 +1,20 @@
-module LambdaBuffers.Codegen.Rust.Print.Refs where
+module LambdaBuffers.Codegen.Rust.Print.Refs (
+  caseIntERef,
+  bigInt,
+  vecAsSlice,
+  vecMacro,
+  boxNew,
+  phantomData,
+  debugTrait,
+  fromU32Trait,
+  fromStrTrait,
+  cloneTrait,
+  partialEqTrait,
+  eqTrait,
+  isPlutusDataTrait,
+  jsonTrait,
+)
+where
 
 import LambdaBuffers.Codegen.Rust.Print.Syntax qualified as R
 
@@ -9,7 +25,7 @@ bigInt :: R.QValName
 bigInt = R.qForeignRef R.MkValueName "num-bigint" [] "BigInt"
 
 vecAsSlice :: R.QValName
-vecAsSlice = R.qForeignRef R.MkValueName "lbr-prelude" ["lamval"] "case_int"
+vecAsSlice = R.qForeignRef R.MkValueName "std" ["vec", "Vec"] "as_slice"
 
 vecMacro :: R.QValName
 vecMacro = R.qForeignRef R.MkValueName "std" [] "vec!"