Skip to content

Structure symbol fix #34

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
simonowen merged 2 commits into from
Aug 28, 2025
Merged

Structure symbol fix #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cf4f172
Fixed issue with Struct symbols
adrianpbrown Aug 27, 2025
db10815
Update README.md
adrianpbrown Aug 27, 2025
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
5 changes: 5 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -574,6 +574,11 @@ INFORMATION PROVIDED BY THE PROGRAM AND THE DOCUMENTATION.

## Release History

Version 1.3.1, 27 August 2025

- Fixed issue where symbols were being defined for elemnts within a struct without
the structure prefix

Version 1.3.0, 25 July 2025

- Converted to Python package installed via pip, to simplify use.
Expand Down
2 changes: 1 addition & 1 deletion src/pyz80/pyz80.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2092,7 +2092,7 @@ def do_pass(p, wholefile, this_currentfilename):
if len(symbol.split()) > 1:
fatal("Whitespace not allowed in symbol name")

if symbol and (opcode[0:3].upper() !="EQU") and (ifstate < 2) and (macrostate == 0):
if (symbol and (opcode[0:3].upper() !="EQU") and (opcode[0:6].upper() !="STRUCT") and (opcode[0:5].upper() !="MACRO") and (ifstate < 2) and (macrostate == 0) and structstate == 0 ):
if p==1:
set_symbol(symbol, origin, is_label=True)
elif get_symbol(symbol) != origin:
Expand Down
Loading