Skip to content

Update Rust code generation to produce the jet environment separately #334

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ivanlele wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update Rust code generation to produce the jet environment separately #334

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 21 additions & 40 deletions Haskell-Generate/GenRustJets.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,23 +187,28 @@ rustJetSourceTy = rustJetTy "source_ty" (\(SomeArrow jet) -> unreflect (fst (rei
rustJetTargetTy :: Module -> Doc a
rustJetTargetTy = rustJetTy "target_ty" (\(SomeArrow jet) -> unreflect (snd (reifyArrow jet)))

rustJetPtr :: Module -> Doc a
rustJetPtr mod = vsep $
[ nest 4 (vsep ("fn c_jet_ptr(&self) -> &dyn Fn(&mut CFrameItem, CFrameItem, &Self::CJetEnvironment) -> bool {" :
if modname == "Bitcoin"
then ["unimplemented!(\"Bitcoin jets have not yet been implemented.\")"]
else [ nest 4 (vsep ("match self {" :
map (<>comma)
[ pretty modname <> "::" <> pretty (jetName jet) <+> "=>" <+>
pretty ("&simplicity_sys::c_jets::jets_wrapper::"++cJetName jet)
| SomeArrow jet <- moduleJets mod
]))
, "}"
]))
rustJetCJetPtr :: Module -> Doc a
rustJetCJetPtr mod = vsep $
[ nest 4 (vsep
[ pretty ("pub(crate) fn c_jet_ptr(jet: &" ++ modname ++ ") -> fn(&mut CFrameItem, CFrameItem, &" ++ cJetEnvType ++ ") -> bool {")
, if modname == "Bitcoin"
then " unimplemented!(\"Bitcoin jets have not yet been implemented.\")"
else vsep
[ nest 4 (vsep ("match jet {" :
map (<>comma)
[ pretty modname <> "::" <> pretty (jetName jet) <+> "=>" <+>
pretty ("simplicity_sys::c_jets::jets_wrapper::"++cJetName jet)
| SomeArrow jet <- moduleJets mod
]))
, "}"
]
])
, "}"
]
where
modname = rustModuleName mod
cJetEnvType | Just "Elements" == moduleName mod = "CElementsTxEnv" :: String
| otherwise = "()"

rustJetEncode :: Module -> Doc a
rustJetEncode mod =
Expand Down Expand Up @@ -250,38 +255,17 @@ rustJetImpl :: Module -> Doc a
rustJetImpl mod = vsep $
[ nest 4 (vsep $ punctuate line
["impl Jet for" <+> pretty modname <+> "{"
, env
, rustJetCmr mod
, rustJetSourceTy mod
, rustJetTargetTy mod
, rustJetEncode mod
, rustJetDecode mod
, rustJetPtr mod
, rustJetCost mod
])
, "}"
]
where
modname = rustModuleName mod
env = vsep
[ pretty $ "type Environment = "++env++";"
, pretty $ "type CJetEnvironment = "++cEnv++";"
, ""
, pretty $ "fn c_jet_env("++envArg++": &Self::Environment) -> &Self::CJetEnvironment {"
, pretty $ " "++envBody
, "}"
]
where
env | Nothing <- moduleName mod = "()"
| Just "Elements" == moduleName mod = "ElementsEnv<std::sync::Arc<elements::Transaction>>"
| Just name <- moduleName mod = name ++ "Env"
cEnv | Just "Elements" == moduleName mod = "CElementsTxEnv"
| otherwise = "()"
envArg | Just "Bitcoin" == moduleName mod = "_env"
| otherwise = "env"
envBody | Nothing == moduleName mod = "env"
| Just "Bitcoin" == moduleName mod = "unimplemented!(\"Unspecified CJetEnvironment for Bitcoin jets\")"
| otherwise = "env.c_tx_env()"

rustJetEnum :: Module -> Doc a
rustJetEnum mod = vsep
Expand Down Expand Up @@ -354,12 +338,8 @@ rustImports mod = vsep (map (<> semi)
, "use std::{fmt, str}"
] ++ envImports))
where
envImports | Nothing == moduleName mod = []
| Just "Bitcoin" == moduleName mod = ["use crate::jet::bitcoin::BitcoinEnv"]
| Just name <- moduleName mod =
[ pretty $ "use crate::jet::"++map toLower name++"::"++name++"Env"
, pretty $ "use simplicity_sys::C"++name++"TxEnv"
]
envImports | Just "Elements" == moduleName mod = ["use simplicity_sys::CElementsTxEnv"]
| otherwise = []

rustJetDoc :: Module -> SimpleDocStream a
rustJetDoc mod = layoutPretty layoutOptions $ vsep (map (<> line)
Expand All @@ -369,6 +349,7 @@ rustJetDoc mod = layoutPretty layoutOptions $ vsep (map (<> line)
, rustJetImpl mod
, rustJetDisplay mod
, rustJetFromStr mod
, rustJetCJetPtr mod
])

rustFFIImports :: Doc a
Expand Down