NATIONAL + UTF8 tests, ref-mod: fix byte offset/size with poor man's display conversion

cobc/ChangeLog

@@ -1,4 +1,9 @@
 
+2026-03-23  Preston Horne <preston.m.horne@vanderbilt.edu>
+
+	* codegen.c (output_data): offset calc for NATIONAL ref-mod
+	* codegen.c (output_size): size calc for NATIONAL ref-mod
+
 2025-12-29  Roger Bowler <rbowler@snipix.net>
 
 	* tree.c (finalize_file): if file is EXTFH enabled then don't warn for

cobc/codegen.c

@@ -1260,6 +1260,9 @@ output_data (cb_tree x)
 		/* Offset */
 		if (r->offset) {
 			output (" + ");
+			if (CB_TREE_CLASS (x) == CB_CLASS_NATIONAL) {
+				output (CB_STRINGIFY (COB_NATIONAL_SIZE) " * ");
+			}
 			output_index (r->offset);
 		}
 
@@ -1317,6 +1320,9 @@ output_size (const cb_tree x)
 			break;
 		}
 		if (r->length) {
+			if (CB_TREE_CLASS (x) == CB_CLASS_NATIONAL) {
+				output (CB_STRINGIFY (COB_NATIONAL_SIZE) " * ");
+			}
 			output_integer (r->length);
 		} else if (r->offset && f->flag_any_length) {
 			output ("%s%d.size - ", CB_PREFIX_FIELD, f->id);
@@ -1358,6 +1364,9 @@ output_size (const cb_tree x)
 			}
 			if (r->offset) {
 				output (" - ");
+				if (CB_TREE_CLASS (x) == CB_CLASS_NATIONAL) {
+					output (CB_STRINGIFY (COB_NATIONAL_SIZE) " * ");
+				}
 				output_index (r->offset);
 			}
 		}
@@ -1600,7 +1609,11 @@ output_attr (const cb_tree x)
 		struct cb_field		*f = CB_FIELD (r->value);
 		flags = 0;
 		if (r->offset) {
-			id = lookup_attr (COB_TYPE_ALPHANUMERIC, 0, 0, 0, NULL, 0);
+			if (CB_TREE_CLASS (x) == CB_CLASS_NATIONAL) {
+				id = lookup_attr (COB_TYPE_NATIONAL, 0, 0, 0, NULL, 0);
+			} else {
+				id = lookup_attr (COB_TYPE_ALPHANUMERIC, 0, 0, 0, NULL, 0);
+			}
 		} else {
 			int type = cb_tree_type (x, f);
 			switch (type) {

libcob/ChangeLog

@@ -1,4 +1,11 @@
 
+2026-03-23  Preston Horne <preston.m.horne@vanderbilt.edu>
+
+	* termio.c (display_national): new function for poor man's
+	  national display conversion
+	* termio.c (cob_display_common): use display_national for
+	  NATIONAL fields
+
 2025-12-04  Simon Sobisch <simonsobisch@gnu.org>
 
 	* fileio.c (indexed_open) [WITH_DB]: if open was successful but checking

libcob/termio.c

@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 2001-2012, 2014-2024 Free Software Foundation, Inc.
+   Copyright (C) 2001-2012, 2014-2024, 2026 Free Software Foundation, Inc.
    Written by Keisuke Nishida, Roger While, Simon Sobisch, Edward Hart
 
    This file is part of GnuCOBOL.
@@ -215,6 +215,26 @@ display_alnum (const cob_field *f, FILE *fp)
 	}
 }
 
+static void
+display_national (const cob_field *f, FILE *fp) 
+{
+	/* TODO: currently only display national data that 
+		overlaps ISO8859-1 and will need an iconv approach later on */
+
+	const unsigned char *end = f->data + f->size;
+	unsigned char *p = f->data;
+
+	while (p < end) {
+		if (p[0] == 0x00) {
+			const int chr = p[1];
+			if (putc (chr, fp) != chr) {
+				break;
+			}
+		}
+		p += 2;
+	}
+}
+
 /* Check for alternate styles of Not A Number and convert to just NaN
    and removes the leading zero from the Exponent
    note: not all environments provide display of negative /quiet NaN,
@@ -323,7 +343,11 @@ cob_display_common (const cob_field *f, FILE *fp)
 		display_numeric ((cob_field *)f, fp);
 		return;
 	}
-	display_alnum (f, fp);
+	if (COB_FIELD_IS_NATIONAL (f)) {
+		display_national ((cob_field *)f, fp);
+	} else {
+		display_alnum (f, fp);
+	}
 }
 
 void

tests/ChangeLog

@@ -1,4 +1,11 @@
 
+2026-03-23  Preston Horne <preston.m.horne@vanderbilt.edu>
+
+	* testsuite.src/run_refmod.at: add static and dynamic
+	  reference-modification tests for NATIONAL and UTF-8 fields
+	* testsuite.src/data_display.at: add DISPLAY test for NATIONAL
+      fields and literals with HEX-OF
+
 2025-12-04  Simon Sobisch <simonsobisch@gnu.org>
 
 	* atlocal.in: reordered to correctly use perf/valgrind definitions also

tests/testsuite.src/data_display.at

@@ -1,4 +1,4 @@
-## Copyright (C) 2003-2012, 2014-2015, 2023 Free Software Foundation, Inc.
+## Copyright (C) 2003-2012, 2014-2015, 2023, 2026 Free Software Foundation, Inc.
 ## Written by Keisuke Nishida, Roger While, Simon Sobisch, Brian Tiffin,
 ## Chuck Haatveet
 ## 
@@ -125,6 +125,60 @@ AT_CHECK([$COBCRUN_DIRECT ./prog], [0], [0123456789pqrstuvwxy])
 AT_CLEANUP
 
 
+AT_SETUP([DISPLAY: national fields/literals])
+AT_KEYWORDS([display])
+
+AT_DATA([prog.cob], [
+       IDENTIFICATION   DIVISION.
+       PROGRAM-ID.      prog.
+       DATA             DIVISION.
+       WORKING-STORAGE  SECTION.
+       01 X             PIC N(4) VALUE N"abcd".
+       01 NUM           PIC 9(6)V99 USAGE NATIONAL
+                         VALUE 12.34.
+       PROCEDURE        DIVISION.
+           DISPLAY N"1234"
+           END-DISPLAY.
+           DISPLAY FUNCTION HEX-OF (N"1234")
+           END-DISPLAY.
+           DISPLAY NUM
+           END-DISPLAY.
+           DISPLAY FUNCTION HEX-OF (NUM)
+           END-DISPLAY.
+           DISPLAY X
+           END-DISPLAY.
+           DISPLAY FUNCTION HEX-OF (X)
+           END-DISPLAY.
+           STOP RUN.
+])
+
+# FIXME: DISPLAY of national literals and national numeric fields not yet handled
+
+AT_XFAIL_IF([true])
+
+AT_CHECK([$COMPILE -fpretty-display -Wno-unfinished prog.cob], [0], [], [])
+AT_CHECK([$COBCRUN_DIRECT ./prog], [0],
+[1234
+0031003200330034
+000012.34
+00300030003000300031003200330034
+abcd
+0061006200630064
+])
+
+AT_CHECK([$COMPILE -fno-pretty-display -Wno-unfinished prog.cob], [0], [], [])
+AT_CHECK([$COBCRUN_DIRECT ./prog], [0],
+[1234
+0031003200330034
+00001234
+00300030003000300031003200330034
+abcd
+0061006200630064
+])
+
+AT_CLEANUP
+
+
 AT_SETUP([DISPLAY: Sign EBCDIC])
 AT_KEYWORDS([display])