Skip to content

pioasm: Throw syntax_error for unsupported 'rel' with irq prev/next #2854

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kilograham merged 1 commit into from
Apr 5, 2026
Merged

pioasm: Throw syntax_error for unsupported 'rel' with irq prev/next #2854

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions tools/pioasm/gen/parser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1347,11 +1347,11 @@ namespace yy {
break;

case 77: // base_instruction: "irq" "prev" irq_modifiers value "rel"
{ pioasm.check_version(1, yylhs.location, "irq prev"); error(yystack_[0].location, "'rel' is not supported for 'irq prev'"); }
{ pioasm.check_version(1, yylhs.location, "irq prev"); throw syntax_error(yystack_[0].location, "'rel' is not supported for 'irq prev'"); }
break;

case 78: // base_instruction: "irq" "next" irq_modifiers value "rel"
{ pioasm.check_version(1, yylhs.location, "irq next"); error(yystack_[0].location, "'rel' is not supported for 'irq next'"); }
{ pioasm.check_version(1, yylhs.location, "irq next"); throw syntax_error(yystack_[0].location, "'rel' is not supported for 'irq next'"); }
break;

case 79: // base_instruction: "irq" irq_modifiers value
Expand Down Expand Up @@ -1415,11 +1415,11 @@ namespace yy {
break;

case 94: // wait_source: "irq" "prev" comma value "rel"
{ pioasm.check_version(1, yylhs.location, "irq prev"); error(yystack_[0].location, "'rel' is not supported for 'irq prev'"); }
{ pioasm.check_version(1, yylhs.location, "irq prev"); throw syntax_error(yystack_[0].location, "'rel' is not supported for 'irq prev'"); }
break;

case 95: // wait_source: "irq" "next" comma value "rel"
{ pioasm.check_version(1, yylhs.location, "irq next"); error(yystack_[0].location, "'rel' is not supported for 'irq next'"); }
{ pioasm.check_version(1, yylhs.location, "irq next"); throw syntax_error(yystack_[0].location, "'rel' is not supported for 'irq next'"); }
break;

case 96: // wait_source: "irq" comma value
Expand Down
8 changes: 4 additions & 4 deletions tools/pioasm/parser.yy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,8 +269,8 @@ base_instruction:
| IRQ irq_modifiers value REL { $$ = std::shared_ptr<instruction>(new instr_irq(@$, $2, $3, 2)); }
| IRQ PREV irq_modifiers value { pioasm.check_version(1, @$, "irq prev"); $$ = std::shared_ptr<instruction>(new instr_irq(@$, $3, $4, 1)); }
| IRQ NEXT irq_modifiers value { pioasm.check_version(1, @$, "irq next"); $$ = std::shared_ptr<instruction>(new instr_irq(@$, $3, $4, 3)); }
| IRQ PREV irq_modifiers value REL { pioasm.check_version(1, @$, "irq prev"); error(@5, "'rel' is not supported for 'irq prev'"); }
| IRQ NEXT irq_modifiers value REL { pioasm.check_version(1, @$, "irq next"); error(@5, "'rel' is not supported for 'irq next'"); }
| IRQ PREV irq_modifiers value REL { pioasm.check_version(1, @$, "irq prev"); throw syntax_error(@5, "'rel' is not supported for 'irq prev'"); }
| IRQ NEXT irq_modifiers value REL { pioasm.check_version(1, @$, "irq next"); throw syntax_error(@5, "'rel' is not supported for 'irq next'"); }
| IRQ irq_modifiers value { $$ = std::shared_ptr<instruction>(new instr_irq(@$, $2, $3)); }
| SET set_target comma value { $$ = std::shared_ptr<instruction>(new instr_set(@$, $2, $4)); }
;
Expand Down Expand Up @@ -299,8 +299,8 @@ wait_source:
IRQ comma value REL { $$ = std::shared_ptr<wait_source>(new wait_source(wait_source::irq, $3, 2)); }
| IRQ PREV comma value { pioasm.check_version(1, @$, "irq prev"); $$ = std::shared_ptr<wait_source>(new wait_source(wait_source::irq, $4, 1)); }
| IRQ NEXT comma value { pioasm.check_version(1, @$, "irq next"); $$ = std::shared_ptr<wait_source>(new wait_source(wait_source::irq, $4, 3)); }
| IRQ PREV comma value REL { pioasm.check_version(1, @$, "irq prev"); error(@5, "'rel' is not supported for 'irq prev'"); }
| IRQ NEXT comma value REL { pioasm.check_version(1, @$, "irq next"); error(@5, "'rel' is not supported for 'irq next'"); }
| IRQ PREV comma value REL { pioasm.check_version(1, @$, "irq prev"); throw syntax_error(@5, "'rel' is not supported for 'irq prev'"); }
| IRQ NEXT comma value REL { pioasm.check_version(1, @$, "irq next"); throw syntax_error(@5, "'rel' is not supported for 'irq next'"); }
| IRQ comma value { $$ = std::shared_ptr<wait_source>(new wait_source(wait_source::irq, $3, 0)); }
| GPIO comma value { $$ = std::shared_ptr<wait_source>(new wait_source(wait_source::gpio, $3)); }
| PIN comma value { $$ = std::shared_ptr<wait_source>(new wait_source(wait_source::pin, $3)); }
Expand Down
Loading