6502/as65
1
0
Fork 0
mirror of https://github.com/softwarejanitor/as65.git synced 2024-11-25 11:32:03 +00:00
Code Issues Projects Releases Wiki Activity

Added error summary

Browse Source
This commit is contained in:
Leeland Heins 2019-01-04 13:05:23 -06:00 committed by GitHub
parent 47ca07151c
commit 78acc11765
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
as65.pl
View File

@ -20,7 +20,7 @@ my $error_summary = 1; # Output error summary, default to on.
my %symbols = (); # Hash of symbol table values. my %symbols = (); # Hash of symbol table values.
my %macros = (); # Hash of macros. my %macros = (); # Hash of macros.
my @errors = []; my @errors = ();
my $in_macro = 0; my $in_macro = 0;
my $cur_macro = ''; my $cur_macro = '';
@ -2492,29 +2492,14 @@ print ">>>> IN CONDITIONAL\n";
print_err("**** $lineno - Unknown symbol '$2' in '$line'\n"); print_err("**** $lineno - Unknown symbol '$2' in '$line'\n");
} }
# Allow arithmetic on symbol # Allow arithmetic on symbol
} elsif ($operand =~ /^([<>]*)([0-9A-Za-z\.\?:][A-Za-z0-9_\.\?:]*)\s*[+]\s*[#]*(\$*[0-9a-fA-F]+)$/) { } elsif ($operand =~ /^([<>]*)([0-9A-Za-z\.\?:][A-Za-z0-9_\.\?:]*)\s*([+-\\*\/])\s*[#]*(\$*[0-9a-fA-F]+)$/) {
# Add
##FIXME -- need to handle < and > here.
my $sym = $2; my $sym = $2;
my $op = $2;
my $opv = $3; my $opv = $3;
if (defined $sym) { if (defined $sym) {
my $symv = $symbols{$sym}; my $symv = $symbols{$sym};
if (defined $symv) { if (defined $symv) {
$symbols{$symbol} = sprintf("\$%x", sym_op($symv, '+', $opv)); $symbols{$symbol} = sprintf("\$%x", sym_op($symv, $op, $opv));
print "%%%% Saving Symbol $symbol $symbols{$symbol}\n" if $verbose;
} else {
print_err("**** $lineno - Unknown symbol '$sym' in '$line'\n");
}
}
} elsif ($operand =~ /^([<>]*)([0-9A-Za-z\.\?:][A-Za-z0-9_\.\?:]*)\s*[-]\s*[#]*(\$*[0-9a-fA-F]+)$/) {
# Subtract
##FIXME -- need to handle < and > here.
my $sym = $2;
my $opv = $3;
if (defined $sym) {
my $symv = $symbols{$sym};
if (defined $symv) {
$symbols{$symbol} = sprintf("\$%x", sym_op($symv, '-', $opv));
print "%%%% Saving Symbol $symbol $symbols{$symbol}\n" if $verbose; print "%%%% Saving Symbol $symbol $symbols{$symbol}\n" if $verbose;
} else { } else {
print_err("**** $lineno - Unknown symbol '$sym' in '$line'\n"); print_err("**** $lineno - Unknown symbol '$sym' in '$line'\n");
@ -3470,6 +3455,21 @@ print ">>>> END CONDITIONAL\n";
close $ofh; close $ofh;
close $ifh; close $ifh;
# Output error summary.
if ($error_summary) {
print "\n";
if (scalar @errors) {
print "**** Summary of errors:\n";
print "\n";
foreach my $line (@errors) {
print $line;
}
print "\n";
} else {
print "**** No errors. ****\n";
}
}
} else { } else {
die "Can't open $input_file\n"; die "Can't open $input_file\n";
} }