Skip to content

Detach the jet codec #335

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
+4 −3
Open

Detach the jet codec #335

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
7 changes: 4 additions & 3 deletions Haskell-Generate/GenRustJets.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ rustJetCJetPtr mod = vsep $

rustJetEncode :: Module -> Doc a
rustJetEncode mod =
"fn encode<W: Write>(&self, w: &mut BitWriter<W>) -> std::io::Result<usize>" <+>
"fn encode(&self, w: &mut BitWriter<&mut dyn Write>) -> std::io::Result<usize>" <+>
nestBraces ("let (n, len) = match self" <+>
nestBraces (vsep (foldMapWithPath item (moduleCodes mod))) <> semi <-> line <> "w.write_bits_be(n, len)")
where
Expand All @@ -223,9 +223,10 @@ rustJetEncode mod =

rustJetDecode :: Module -> Doc a
rustJetDecode mod =
"fn decode<I: Iterator<Item = u8>>(bits: &mut BitIter<I>) -> Result<Self, decode::Error>" <+>
pretty ("pub(crate) fn decode<I: Iterator<Item = u8>>(bits: &mut BitIter<I>) -> Result<" ++ modname ++ ", decode::Error>") <+>
nestBraces ("decode_bits!(bits," <+> braces (docTree (moduleCodes mod)) <> ")")
where
modname = rustModuleName mod
docTree Dead = mempty
docTree (Leaf (SomeArrow jet)) = pretty (rustModuleName mod ++ "::" ++ jetName jet)
docTree (Branch l r) = nest 4
Expand Down Expand Up @@ -259,7 +260,6 @@ rustJetImpl mod = vsep $
, rustJetSourceTy mod
, rustJetTargetTy mod
, rustJetEncode mod
, rustJetDecode mod
, rustJetCost mod
])
, "}"
Expand Down Expand Up @@ -350,6 +350,7 @@ rustJetDoc mod = layoutPretty layoutOptions $ vsep (map (<> line)
, rustJetDisplay mod
, rustJetFromStr mod
, rustJetCJetPtr mod
, rustJetDecode mod
])

rustFFIImports :: Doc a
Expand Down
Loading