From ab937aa75bcda9af74b0f221848aff1a8b7a6921 Mon Sep 17 00:00:00 2001
From: paxcut <paxcut@outlook.com>
Date: Thu, 30 Jan 2025 09:20:56 -0700
Subject: [PATCH] fix: fixes issue #346

In issue #346 it is noted that the format functions return the same value repeatidly and erroneously. This is due to the use of global variables which result on only their last value being used in format functions due to their delayed evaluation. Fixed by using local variables instead. Also remove tabs from the file and an unused tags variable.
---
 patterns/protobuf.hexpat | 61 +++++++++++++++++++---------------------
 1 file changed, 29 insertions(+), 32 deletions(-)

diff --git a/patterns/protobuf.hexpat b/patterns/protobuf.hexpat
index 2624378d..4e36b615 100644
--- a/patterns/protobuf.hexpat
+++ b/patterns/protobuf.hexpat
@@ -8,73 +8,70 @@ import std.mem;
 import type.leb128;
 
 struct ZigZag32 {
-	u32 value;
+    u32 value;
 } [[sealed, format("format_zigzag32")]];
 
 fn format_zigzag32(ZigZag32 zigzag) {
-	return s32((s32(zigzag.value) << 1) ^ (s32(zigzag.value) >> 31));
+    return s32((s32(zigzag.value) << 1) ^ (s32(zigzag.value) >> 31));
 };
 
 struct ZigZag64 {
-	u64 value;
+    u64 value;
 } [[sealed, format("format_zigzag64")]];
 
 fn format_zigzag64(ZigZag64 zigzag) {
-	return s64((s64(zigzag.value) << 1) ^ (s64(zigzag.value) >> 63));
+    return s64((s64(zigzag.value) << 1) ^ (s64(zigzag.value) >> 63));
 };
 
 enum WireType : u8 {
-	Varint 			= 0,
-	_64Bit 			= 1,
-	LengthDelimited = 2,
-	StartGroup 		= 3,
-	EndGroup 		= 4,
-	_32Bit 			= 5
+    Varint          = 0,
+    _64Bit          = 1,
+    LengthDelimited = 2,
+    StartGroup      = 3,
+    EndGroup        = 4,
+    _32Bit          = 5
 };
 
-WireType wire_type;
-u32 tag;
-u32 field_number;
 
 struct Key {
     type::uLEB128 keyDec;
-    field_number = u32(keyDec) >> 3;
-    wire_type = u32(keyDec) & 7;
+    u32 field_number = u32(keyDec) >> 3;
+    WireType wire_type = u32(keyDec) & 7;
 }[[sealed, format("format_key")]];
 
 fn format_key(Key keyObject) {
-    return std::format("{} with field number {}", wire_type, field_number);
+    return std::format("{} with field number {}", keyObject.wire_type, keyObject.field_number);
 };
 
 union _64Bit {
-	u64 fixed64;
-	ZigZag64 sfixed64;
-	double dbl;
+    u64 fixed64;
+    ZigZag64 sfixed64;
+    double dbl;
 };
 
 union _32Bit {
-	u32 fixed32;
-	ZigZag32 sfixed32;
-	float flt;
+    u32 fixed32;
+    ZigZag32 sfixed32;
+    float flt;
 };
 
 struct LengthDelimited {
-	type::uLEB128 length;
-	char data[length];
+    type::uLEB128 length;
+    char data[length];
 };
 
 
 struct Entry {
     Key key;
 
-	if (wire_type == WireType::Varint)
-		type::uLEB128 value;
-	else if (wire_type == WireType::_64Bit)
-		_64Bit value;
-	else if (wire_type == WireType::LengthDelimited)
-		LengthDelimited value;
-	else if (wire_type == WireType::_32Bit)
-		_32Bit value;
+    if (key.wire_type == WireType::Varint)
+    type::uLEB128 value;
+    else if (key.wire_type == WireType::_64Bit)
+    _64Bit value;
+    else if (key.wire_type == WireType::LengthDelimited)
+    LengthDelimited value;
+    else if (key.wire_type == WireType::_32Bit)
+    _32Bit value;
 };
 
 Entry entries[while(!std::mem::eof())] @ 0x00;
\ No newline at end of file