From ff006c54bdd752c973d559c94a186681054d62b3 Mon Sep 17 00:00:00 2001 From: Grazfather Date: Thu, 9 Jan 2025 14:57:12 -0500 Subject: [PATCH] Fix error handling in rp2xxx pio assembler (#346) --- port/raspberrypi/rp2xxx/src/hal/pio/assembler.zig | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/port/raspberrypi/rp2xxx/src/hal/pio/assembler.zig b/port/raspberrypi/rp2xxx/src/hal/pio/assembler.zig index 85d229c4..9738d37a 100644 --- a/port/raspberrypi/rp2xxx/src/hal/pio/assembler.zig +++ b/port/raspberrypi/rp2xxx/src/hal/pio/assembler.zig @@ -123,10 +123,11 @@ fn format_compile_error(comptime message: []const u8, comptime source: []const u pub fn assemble(comptime source: []const u8, comptime options: AssembleOptions) Output { var diags: ?Diagnostics = null; - return assemble_impl(source, &diags, options) catch |err| if (diags) |d| - @compileError(format_compile_error(d.message.slice(), source, d.index)) - else - @compileError(err); + return assemble_impl(source, &diags, options) catch |err| { + if (diags) |d| + @compileError(format_compile_error(d.message.slice(), source, d.index)); + @compileError(@errorName(err)); + }; } test "tokenizer and encoder" {