From 25fecab5b3f44325f18c32ee490e07ba1febbcf9 Mon Sep 17 00:00:00 2001
From: koniifer <koniifer@proton.me>
Date: Fri, 20 Dec 2024 10:47:22 +0000
Subject: [PATCH] new broken
---
Cargo.lock | 28 +++++++---------------
repbuild/Cargo.toml | 4 ++--
sysdata/libraries/stn/src/fmt.hb | 3 ++-
sysdata/programs/test/src/tests/stn/fmt.hb | 4 +++-
4 files changed, 16 insertions(+), 23 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index e3e2cfe..5f1cd51 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -175,9 +175,9 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
[[package]]
name = "foldhash"
-version = "0.1.3"
+version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f81ec6369c545a7d40e4589b5597581fa1c441fe1cce96dd1de43159910a36a2"
+checksum = "a0d2fde1f7b3d48b8395d5f2de76c18a528bd6a9cdde438df747bfcba3e05d6f"
[[package]]
name = "form_urlencoded"
@@ -213,35 +213,25 @@ dependencies = [
[[package]]
name = "hbbytecode"
version = "0.1.0"
-
-[[package]]
-name = "hbbytecode"
-version = "0.1.0"
-source = "git+https://git.ablecorp.us/AbleOS/holey-bytes.git#8ad58ee6b626736d7660713a5a29f590463b0e41"
+source = "git+https://git.ablecorp.us/AbleOS/holey-bytes.git#f59c0c10922fb330d43b944a5bfcaa1021ecffe3"
[[package]]
name = "hblang"
version = "0.1.0"
+source = "git+https://git.ablecorp.us/AbleOS/holey-bytes.git#f59c0c10922fb330d43b944a5bfcaa1021ecffe3"
dependencies = [
"hashbrown",
- "hbbytecode 0.1.0",
- "hbvm 0.1.0",
+ "hbbytecode",
+ "hbvm",
"log",
]
[[package]]
name = "hbvm"
version = "0.1.0"
+source = "git+https://git.ablecorp.us/AbleOS/holey-bytes.git#f59c0c10922fb330d43b944a5bfcaa1021ecffe3"
dependencies = [
- "hbbytecode 0.1.0",
-]
-
-[[package]]
-name = "hbvm"
-version = "0.1.0"
-source = "git+https://git.ablecorp.us/AbleOS/holey-bytes.git#8ad58ee6b626736d7660713a5a29f590463b0e41"
-dependencies = [
- "hbbytecode 0.1.0 (git+https://git.ablecorp.us/AbleOS/holey-bytes.git)",
+ "hbbytecode",
]
[[package]]
@@ -401,7 +391,7 @@ dependencies = [
"crossbeam-queue",
"derive_more",
"hashbrown",
- "hbvm 0.1.0 (git+https://git.ablecorp.us/AbleOS/holey-bytes.git)",
+ "hbvm",
"ktest_macro",
"limine",
"log",
diff --git a/repbuild/Cargo.toml b/repbuild/Cargo.toml
index 3d006a3..27d9491 100644
--- a/repbuild/Cargo.toml
+++ b/repbuild/Cargo.toml
@@ -14,8 +14,8 @@ fatfs = { version = "0.3", default-features = false, features = [
"alloc",
] }
toml = "0.8"
-#hblang.git = "https://git.ablecorp.us/AbleOS/holey-bytes.git"
-hblang.path = "../../holey-bytes/lang/"
+hblang.git = "https://git.ablecorp.us/AbleOS/holey-bytes.git"
+# hblang.path = "../../holey-bytes/lang/"
log = "0.4"
raw-cpuid = "11"
ureq = { version = "2", default-features = false, features = ["tls"] }
diff --git a/sysdata/libraries/stn/src/fmt.hb b/sysdata/libraries/stn/src/fmt.hb
index db056e4..a5ed592 100644
--- a/sysdata/libraries/stn/src/fmt.hb
+++ b/sysdata/libraries/stn/src/fmt.hb
@@ -179,6 +179,7 @@ format := fn(v: @Any(), str: ^u8, opts: FormatOptions): uint {
.Opt => return @inline(fmt_nullable, v, str, opts),
.Enum => return @inline(fmt_enum, v, str, opts),
.Struct => return @inline(fmt_container, v, str, opts),
+ .Tuple => return @inline(fmt_container, v, str, opts),
.Slice => return @inline(fmt_container, v, str, opts),
_ => @error("Type: \"\0", T, "\" is not supported.\0"),
}
@@ -198,4 +199,4 @@ FormatOptions := struct {
radix: uint = 10,
// temporarily here, will change later maybe
log: LogLevel = .Info,
-}
+}
\ No newline at end of file
diff --git a/sysdata/programs/test/src/tests/stn/fmt.hb b/sysdata/programs/test/src/tests/stn/fmt.hb
index 2ea1f28..a5d243a 100644
--- a/sysdata/programs/test/src/tests/stn/fmt.hb
+++ b/sysdata/programs/test/src/tests/stn/fmt.hb
@@ -19,6 +19,7 @@ EnumThingy := enum {
test := fn(): uint {
log.print(@nameof(?u8), .{log: .Error})
+ log.print("Hello, World\0", .{})
log.print(EnumThingy.The, .{})
log.print(StructThingy.(-100, -100, .(-math.PI, true)), .{log: .Warn})
log.print(SubStructThingy.(-math.E, false), .{})
@@ -28,6 +29,7 @@ test := fn(): uint {
log.print(&SubStructThingy.(0.0, true), .{})
log.print(@as(?u32, null), .{})
log.print(@as(?u32, 200), .{})
+ log.print(.(@as(?u32, null), 200, 3.14), .{})
return 0
-}
+}
\ No newline at end of file