Fix various remaining issues, bump versions

Author: Gui-Yom

.github/workflows/release-cli.yml

@@ -9,4 +9,3 @@ codegen-units = 4
 [profile.release-web]
 inherits = "release"
 opt-level = "s"
-strip = true

Cargo.lock

@@ -0,0 +1,3 @@
+class Empty {
+    static function main() {}
+}

Cargo.toml

@@ -6,7 +6,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased](https://github.com/Gui-Yom/hlbc/compare/cli-v0.5.0...HEAD)
+## [Unreleased](https://github.com/Gui-Yom/hlbc/compare/v0.6.0...HEAD)
+
+## [0.6.0](https://github.com/Gui-Yom/hlbc/compare/v0.5.0...v0.6.0) - 2023-05-07
+
+### Changed
 
 - Updated to latest hlbc
 

data/Empty.hx

@@ -1,6 +1,6 @@
 [package]
 name = "hlbc-cli"
-version = "0.5.0"
+version = "0.6.0"
 authors = ["Guillaume Anthouard <[email protected]>"]
 edition = "2021"
 rust-version = "1.64"
@@ -27,9 +27,9 @@ chumsky = { version = "0.9" }
 # CLI args
 clap = { version = "4", features = ["derive"] }
 # Core functionnality
-hlbc = { version = "0.5", path = "../hlbc", default-features = false }
+hlbc = { version = "0.6", path = "../hlbc", default-features = false }
 # Decompiler
-hlbc-decompiler = { version = "0.5", path = "../hlbc-decompiler" }
+hlbc-decompiler = { version = "0.6", path = "../hlbc-decompiler" }
 # File system watching
 notify = { version = "5", optional = true, default-features = false, features = ["macos_fsevent"] }
 notify-debouncer-mini = { version = "0.2", optional = true, default-features = false }

hlbc-cli/CHANGELOG.md

@@ -6,10 +6,18 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased](https://github.com/Gui-Yom/hlbc/compare/v0.5.0...HEAD)
+## [Unreleased](https://github.com/Gui-Yom/hlbc/compare/v0.6.0...HEAD)
+
+## [0.6.0](https://github.com/Gui-Yom/hlbc/compare/v0.5.0...v0.6.0) - 2023-05-07
+
+### Changed
 
 - Updated to latest hlbc
 
+### Fixed
+
+- Fix `trace` ast post-processing step
+
 ## [0.5.0](https://github.com/Gui-Yom/hlbc/compare/v0.4.0...v0.5.0) - 2021-09-15
 
 ### Changed

hlbc-cli/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "hlbc-decompiler"
-version = "0.5.0"
+version = "0.6.0"
 authors = ["Guillaume Anthouard <[email protected]>"]
 edition = "2021"
 rust-version = "1.56"
@@ -15,7 +15,7 @@ categories = ["visualization", "compilers"]
 [dependencies]
 # Advanced formatting functionalities
 fmtools = "0.1"
-hlbc = { version = "0.5", path = "../hlbc" }
+hlbc = { version = "0.6", path = "../hlbc" }
 # Graph utilities
 petgraph = { version = "0.6", default-features = false, features = ["graphmap"], optional = true }
 

hlbc-decompiler/CHANGELOG.md

@@ -32,9 +32,7 @@ pub struct Method {
     pub statements: Vec<Statement>,
 }
 
-// TODO make this zero copy by accepting the Ref* types instead and only resolving on demand
-
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, Copy)]
 pub enum Constant {
     InlineInt(usize),
     Int(RefInt),

hlbc-decompiler/Cargo.toml

@@ -1,11 +1,12 @@
 use std::fmt;
 use std::fmt::{Display, Formatter};
 
-use crate::ast::{Class, Constant, ConstructorCall, Expr, Method, Operation, Statement};
-use hlbc::fmt::EnhancedFmt;
+use hlbc::fmt::{BytecodeFmt, EnhancedFmt};
 use hlbc::types::{Function, RefField, Type};
 use hlbc::{Bytecode, Resolve};
 
+use crate::ast::{Class, Constant, ConstructorCall, Expr, Method, Operation, Statement};
+
 #[derive(Clone)]
 pub struct FormatOptions {
     indent: String,
@@ -100,17 +101,19 @@ impl Method {
     }
 }
 
-impl Display for Constant {
-    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
+impl Constant {
+    fn fmt(&self, f: &mut Formatter, code: &Bytecode) -> fmt::Result {
         use Constant::*;
-        match self {
-            InlineInt(c) => Display::fmt(c, f),
-            Int(c) => Display::fmt(c, f),
-            Float(c) => Display::fmt(c, f),
-            String(c) => write!(f, "\"{c}\""),
-            Bool(c) => Display::fmt(c, f),
-            Null => Display::fmt("null", f),
-            This => Display::fmt("this", f),
+        match *self {
+            InlineInt(c) => Display::fmt(&c, f),
+            Int(c) => EnhancedFmt.fmt_refint(f, code, c),
+            Float(c) => EnhancedFmt.fmt_reffloat(f, code, c),
+            String(c) => {
+                write!(f, "\"{}\"", c.display::<EnhancedFmt>(code))
+            }
+            Bool(c) => Display::fmt(&c, f),
+            Null => f.write_str("null"),
+            This => f.write_str("this"),
         }
     }
 }
@@ -176,7 +179,7 @@ impl Expr {
                             .enumerate()
                             .map(|(i, f)| {
                                 fmtools::fmt! { move
-                                    {f.name}": "{disp!(values.get(&RefField(i)).unwrap())}
+                                    {f.name(code)}": "{disp!(values.get(&RefField(i)).unwrap())}
                                 }
                             })) }"}"
                     }
@@ -188,7 +191,7 @@ impl Expr {
                 Expr::Call(call) => {
                     {disp!(call.fun)}"("{fmtools::join(", ", call.args.iter().map(|e| disp!(e)))}")"
                 }
-                Expr::Constant(c) => {{c}},
+                Expr::Constant(c) => {|f| c.fmt(f, code)?;},
                 Expr::Constructor(ConstructorCall { ty, args }) => {
                     "new "{ty.display::<EnhancedFmt>(code)}"("{fmtools::join(", ", args.iter().map(|e| disp!(e)))}")"
                 }