Add support for 32-bit string units

Author: BoilingTeapot

src/MagesScriptTool/CompiledStringEncoding.cs

@@ -3,27 +3,31 @@
 namespace MagesScriptTool;
 
 sealed class CompiledStringEncoding {
+	readonly CompiledStringUnitEncoding _unitEncoding;
 	readonly StringTagsSpec _spec;
 
-	public CompiledStringEncoding(StringTagsSpec spec) {
+	public CompiledStringEncoding(CompiledStringUnitEncoding unitEncoding, StringTagsSpec spec) {
+		_unitEncoding = unitEncoding;
 		_spec = spec;
 	}
 
 	public void Encode(Stream stream, ImmutableArray<StringToken> tokens) {
-		new CompiledStringEncoder(stream, _spec, tokens).Encode();
+		new CompiledStringEncoder(stream, _unitEncoding, _spec, tokens).Encode();
 	}
 
 	public ImmutableArray<StringToken> Decode(Stream stream) {
-		return new CompiledStringDecoder(stream, _spec).Decode();
+		return new CompiledStringDecoder(stream, _unitEncoding, _spec).Decode();
 	}
 
 	sealed class CompiledStringEncoder {
 		readonly Stream _stream;
+		readonly CompiledStringUnitEncoding _unitEncoding;
 		readonly StringTagsSpec _spec;
 		readonly ImmutableArray<StringToken> _tokens;
 
-		public CompiledStringEncoder(Stream stream, StringTagsSpec spec, ImmutableArray<StringToken> tokens) {
+		public CompiledStringEncoder(Stream stream, CompiledStringUnitEncoding unitEncoding, StringTagsSpec spec, ImmutableArray<StringToken> tokens) {
 			_stream = stream;
+			_unitEncoding = unitEncoding;
 			_spec = spec;
 			_tokens = tokens;
 		}
@@ -64,8 +68,23 @@ void EncodeTag(StringTokenTag tag) {
 
 		void EncodeUnit(StringTokenUnit unit) {
 			int value = unit.Value;
-			PutByte((byte)((value >> 8) & 0x7F | 0x80));
-			PutByte((byte)((value >> 0) & 0xFF));
+			switch (_unitEncoding) {
+				case CompiledStringUnitEncoding.UInt16: {
+					PutByte((byte)((value >> 8) & 0x7F | 0x80));
+					PutByte((byte)((value >> 0) & 0xFF));
+					break;
+				}
+				case CompiledStringUnitEncoding.UInt32: {
+					PutByte((byte)((value >> 24) & 0x7F | 0x80));
+					PutByte((byte)((value >> 16) & 0xFF));
+					PutByte((byte)((value >>  8) & 0xFF));
+					PutByte((byte)((value >>  0) & 0xFF));
+					break;
+				}
+				default: {
+					throw new NotImplementedException($"{_unitEncoding} is not implemented.");
+				}
+			}
 		}
 
 		void EncodeOperand(OperandKind kind, ExpressionNode expression) {
@@ -107,10 +126,12 @@ void PutByte(byte value) {
 
 	sealed class CompiledStringDecoder {
 		readonly Stream _stream;
+		readonly CompiledStringUnitEncoding _unitEncoding;
 		readonly StringTagsSpec _spec;
 
-		public CompiledStringDecoder(Stream stream, StringTagsSpec spec) {
+		public CompiledStringDecoder(Stream stream, CompiledStringUnitEncoding unitEncoding, StringTagsSpec spec) {
 			_stream = stream;
+			_unitEncoding = unitEncoding;
 			_spec = spec;
 		}
 
@@ -154,8 +175,23 @@ StringTokenTag DecodeTag() {
 
 		StringTokenUnit DecodeUnit() {
 			int value = 0;
-			value |= (GetByte() & 0x7F) << 8;
-			value |= (GetByte() & 0xFF) << 0;
+			switch (_unitEncoding) {
+				case CompiledStringUnitEncoding.UInt16: {
+					value |= (GetByte() & 0x7F) << 8;
+					value |= (GetByte() & 0xFF) << 0;
+					break;
+				}
+				case CompiledStringUnitEncoding.UInt32: {
+					value |= (GetByte() & 0x7F) << 24;
+					value |= (GetByte() & 0xFF) << 16;
+					value |= (GetByte() & 0xFF) <<  8;
+					value |= (GetByte() & 0xFF) <<  0;
+					break;
+				}
+				default: {
+					throw new NotImplementedException($"{_unitEncoding} is not implemented.");
+				}
+			};
 			return new(value);
 		}
 

src/MagesScriptTool/CompiledStringUnitEncoding.cs

@@ -0,0 +1,6 @@
+namespace MagesScriptTool;
+
+enum CompiledStringUnitEncoding {
+	UInt16,
+	UInt32,
+}

src/MagesScriptTool/Program.cs

@@ -59,6 +59,12 @@ static class Program {
 		IsRequired = true,
 	};
 
+	static readonly Option<CompiledStringUnitEncoding> StringUnitEncodingOption = new(
+		name: "--string-unit-encoding",
+		getDefaultValue: () => CompiledStringUnitEncoding.UInt16,
+		description: "The encoding to use for compiled string units."
+	);
+
 	static readonly Option<bool> GenerateSdbOption = new(
 		name: "--generate-sdb",
 		description: "Enable generation of SDB files. (currently only works for decompilation)"
@@ -94,6 +100,7 @@ public Tool(ParseResult result) {
 			string bankDirectory = result.GetValueForOption(BankDirectoryOption)!;
 			string flagSet = result.GetValueForOption(FlagSetOption)!;
 			string charsetName = result.GetValueForOption(CharsetOption)!;
+			CompiledStringUnitEncoding compiledStringUnitEncoding = result.GetValueForOption(StringUnitEncodingOption)!;
 
 			SpecBank bank = SpecBank.Load(bankDirectory);
 			ImmutableDictionary<string, bool> flags = bank.GetFlags(flagSet);
@@ -110,7 +117,7 @@ public Tool(ParseResult result) {
 			ImmutableArray<StringTagSpec> stringTagSpecs = bank.GetStringTagSpecs(flags);
 			StringTagsSpec stringTagsSpec = new(stringTagSpecs);
 
-			CompiledStringEncoding compiledStringEncoding = new(stringTagsSpec);
+			CompiledStringEncoding compiledStringEncoding = new(compiledStringUnitEncoding, stringTagsSpec);
 			CompiledScriptPackageEncoding = new(compiledStringEncoding);
 			CompiledStringTableEncoding = new(compiledStringEncoding);
 		}
@@ -143,6 +150,7 @@ static async Task<int> Main(string[] args) {
 		rootCommand.AddGlobalOption(BankDirectoryOption);
 		rootCommand.AddGlobalOption(FlagSetOption);
 		rootCommand.AddGlobalOption(CharsetOption);
+		rootCommand.AddGlobalOption(StringUnitEncodingOption);
 
 		rootCommand.SetHandler(async context => {
 			try {