CVS commit: pkgsrc/cross/z80asm

["Jason R Thorpe" <thorpej%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   thorpej
Date:           Fri Jan 27 23:22:31 UTC 2023

Modified Files:
        pkgsrc/cross/z80asm: Makefile distinfo
        pkgsrc/cross/z80asm/patches: patch-expressions.c

Log Message:
Fix a bug in "?label" expression evaluation, which caused those expressions
to result in an "non-existent label" error when testing for the existence
of a label that does not yet exist (which is the whole point of that
expression).

Bump PKGREVISION to 1.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/cross/z80asm/Makefile \
    pkgsrc/cross/z80asm/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/cross/z80asm/patches/patch-expressions.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/cross/z80asm/Makefile
diff -u pkgsrc/cross/z80asm/Makefile:1.1 pkgsrc/cross/z80asm/Makefile:1.2
--- pkgsrc/cross/z80asm/Makefile:1.1    Fri Jan 20 21:43:56 2023
+++ pkgsrc/cross/z80asm/Makefile        Fri Jan 27 23:22:31 2023
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.1 2023/01/20 21:43:56 thorpej Exp $
+# $NetBSD: Makefile,v 1.2 2023/01/27 23:22:31 thorpej Exp $
 
 DISTNAME=      z80asm-1.8
 CATEGORIES=    cross
 MASTER_SITES=  https://download.savannah.nongnu.org/releases/z80asm/
 
+PKGREVISION=   1
+
 MAINTAINER=    thorpej%NetBSD.org@localhost
 HOMEPAGE=      https://savannah.nongnu.org/projects/z80asm/
 COMMENT=       Assembler for the Z80 microprcessor
Index: pkgsrc/cross/z80asm/distinfo
diff -u pkgsrc/cross/z80asm/distinfo:1.1 pkgsrc/cross/z80asm/distinfo:1.2
--- pkgsrc/cross/z80asm/distinfo:1.1    Fri Jan 20 21:43:56 2023
+++ pkgsrc/cross/z80asm/distinfo        Fri Jan 27 23:22:31 2023
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.1 2023/01/20 21:43:56 thorpej Exp $
+$NetBSD: distinfo,v 1.2 2023/01/27 23:22:31 thorpej Exp $
 
 BLAKE2s (z80asm-1.8.tar.gz) = c20093c5cce1121728b3deb795136402429fda251a101a533f0d4434019ccdfd
 SHA512 (z80asm-1.8.tar.gz) = 0b2da513200dbdd2d4867347b24488c786e014e4ab84e92e8f0585971bb39a57e65409dc6a95edbe9c017ebb3b25b4b4be9a7bd436b6cf610b59d46a711cb66f
 Size (z80asm-1.8.tar.gz) = 57269 bytes
 SHA1 (patch-Makefile) = 3b3c85d4005ea5e8dc5ee910f854e46b1b8f7b0a
-SHA1 (patch-expressions.c) = c44284596a5278b347707dda5fe8fa85a98030cc
+SHA1 (patch-expressions.c) = ae8242f40b38a77cb7642f1bed52db58a1ed0a86
 SHA1 (patch-z80asm.c) = d5abe41d337a738ec41bae19c2d68262dca04339

Index: pkgsrc/cross/z80asm/patches/patch-expressions.c
diff -u pkgsrc/cross/z80asm/patches/patch-expressions.c:1.1 pkgsrc/cross/z80asm/patches/patch-expressions.c:1.2
--- pkgsrc/cross/z80asm/patches/patch-expressions.c:1.1 Fri Jan 20 21:43:56 2023
+++ pkgsrc/cross/z80asm/patches/patch-expressions.c     Fri Jan 27 23:22:31 2023
@@ -1,9 +1,12 @@
-$NetBSD: patch-expressions.c,v 1.1 2023/01/20 21:43:56 thorpej Exp $
+$NetBSD: patch-expressions.c,v 1.2 2023/01/27 23:22:31 thorpej Exp $
 
-Cast arguments to ctype(3) functions to (unsigned char).
+- Cast arguments to ctype(3) functions to (unsigned char).
+- Fix a bug in "?label" expressions that caused the expressions testing
+  for the existence of the label that doesn't exist (which is what the
+  expression is for) to always fail with an "non-existent label" error.
 
 --- expressions.c.orig 2009-04-11 08:33:07.000000000 +0000
-+++ expressions.c      2023-01-20 20:44:01.470323352 +0000
++++ expressions.c      2023-01-27 23:10:00.636129136 +0000
 @@ -48,7 +48,7 @@ rd_number (const char **p, const char **
             "(string=%s).\n", stack[sp].line, addr, base, *p);
    num[base] = '\0';
@@ -42,3 +45,11 @@ Cast arguments to ctype(3) functions to 
      {
      }
    s2 = c - *p;
+@@ -402,6 +402,7 @@ rd_value (const char **p, int *valid, in
+     case '@':
+       return not ^ (sign * rd_otherbasenumber (p, valid, print_errors));
+     case '?':
++      ++*p;
+       rd_label (p, &exist, NULL, level, 0);
+       return not ^ (sign * exist);
+     case '&':