6502/x65
1
0
Fork 0
mirror of https://github.com/ksherlock/x65.git synced 2026-04-24 07:16:50 +00:00
Code Issues Projects Releases Wiki Activity

First column in Merlin mode recognizes scope braces ('{' and '}')

Browse Source
This commit is contained in:
Carl-Henrik Skårstedt
2016-03-17 21:33:39 -07:00
parent 955665c91c
commit c01b19a68c
4 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
x65.cpp
+1 -1
View File
@@ -5700,7 +5700,7 @@ StatusCode Asm::BuildLine(strref line)
line.trim_whitespace();
bool force_label = charE==':' || charE=='$';
if (!force_label && Merlin() && (line || operation)) // MERLIN fixes and PoP does some naughty stuff like 'and = 0'
force_label = !strref::is_ws(char0) || char1==']' || charE=='?';
force_label = (!strref::is_ws(char0) && char0!='{' && char0!='}') || char1==']' || charE=='?';
else if (!Merlin() && line[0]==':')
force_label = true;
if (!operation && !force_label) {