From 963ea7c17056d94c9e2fcc0c1ff1b2ea19885469 Mon Sep 17 00:00:00 2001 From: phil Date: Fri, 25 Oct 2019 17:53:14 -0400 Subject: [PATCH] as7 tweaks: make it clear multiple define is not an error; fix = for tmg --- tools/as7 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/as7 b/tools/as7 index 75f9838..45aa87d 100755 --- a/tools/as7 +++ b/tools/as7 @@ -294,7 +294,7 @@ sub set_label # An error to have different values if ( defined( $Glabel{$label} ) && $Glabel{$label} != $loc ) { # non-fatal: as.s doesn't even warn!!!! - print STDERR "$file:$lineno: Global label $label multiply defined\n" + print STDERR "$file:$lineno: NOTE: Global label $label multiply defined (not an error)\n" if ($stage == 2); } else { @@ -398,7 +398,7 @@ sub parse_line { return if (eol()); - if ( $line =~ s{^(\S+)\s*=}{}) { # assignment + if ( $line =~ s{^([^;= \t]+)\s*=}{}) { # assignment my $lhs = $1; my $word = parse_expression(); printf( "Setting variable %s to 0%o\n", $lhs, $word ) if ($debug);