1
0
mirror of https://github.com/cc65/cc65.git synced 2024-12-24 11:31:31 +00:00

MagerValp: I adjusted some of the regexps in ca65html again, to better detect

labels, and to eliminate false positives where labels start with three
characters matching an opcode.


git-svn-id: svn://svn.cc65.org/cc65/trunk@3769 b7a2c559-68d2-44c3-8de9-860c34a00d81
This commit is contained in:
cuz 2007-02-03 18:26:16 +00:00
parent 9601baf6ec
commit bcd13b2dca

View File

@ -388,7 +388,7 @@ sub Process1 {
chop ($Line); chop ($Line);
# Check for a label # Check for a label
if ($Line =~ /^\s*(\@?)([_a-zA-Z]\w*)\s*(:|=)/) { if ($Line =~ /^\s*(\@?)([_a-zA-Z]\w*)(:(?!=)|\s*:?=)/)
# Is this a local label? # Is this a local label?
if ($1 eq "\@") { if ($1 eq "\@") {
@ -559,7 +559,7 @@ sub Process2 {
# Check for a label at the start of the line. If we have one, process # Check for a label at the start of the line. If we have one, process
# it and remove it from the line # it and remove it from the line
if ($Line =~ s/^\s*?(\@?)([_a-zA-Z]\w*)(\s*)(:|=)//) { if ($Line =~ s/^\s*?(\@?)([_a-zA-Z]\w*)(:(?!=)|\s*:?=)//) {
# Is this a local label? # Is this a local label?
if ($1 eq "\@") { if ($1 eq "\@") {
@ -825,7 +825,7 @@ sub Process2 {
$OutLine .= Cleanup ($Line); $OutLine .= Cleanup ($Line);
# Check for instructions with labels # Check for instructions with labels
} elsif ($Line =~ /^($LabelIns)(\s+)(.*)$/) { } elsif ($Line =~ /^($LabelIns)\b(\s+)(.*)$/) {
# Print the instruction and white space # Print the instruction and white space
$OutLine .= ColorizeKeyword ($1) . $2; $OutLine .= ColorizeKeyword ($1) . $2;
@ -854,7 +854,7 @@ sub Process2 {
$OutLine .= $Operand; $OutLine .= $Operand;
# Check for all other instructions # Check for all other instructions
} elsif ($Line =~ /^($AllIns)(.*)$/) { } elsif ($Line =~ /^($AllIns)\b(.*)$/) {
# Colorize and print # Colorize and print
$OutLine .= ColorizeKeyword ($1) . Cleanup ($2); $OutLine .= ColorizeKeyword ($1) . Cleanup ($2);