Reincorporate Printf4J as AwkPrintf with full AWK printf semantics

AGENTS.md

@@ -20,10 +20,13 @@ Whenever required, when you add code or when you modify code that is not covered
 
 Compatibility tests are run with `mvn verify` to assess the compatibility with other implementations of AWK. These tests are run with the Maven failsafe plugin and results are stored in the ./target/failsafe-reports directory.
 
-All new or updated unit tests must use the helper methods in
-`org.metricshub.jawk.AwkTestSupport`. The builders in that class encapsulate the
-correct Jawk setup, assertion flow, and temporary file handling, so reusing
-them keeps the test suite consistent and reliable.
+All new or updated unit tests that run AWK scripts must use the helper methods
+in `io.jawk.AwkTestSupport`. The builders in that class encapsulate the correct
+Jawk setup, assertion flow, and temporary file handling, so reusing them keeps
+the test suite consistent and reliable. `AwkTestSupport` is ONLY for running
+AWK scripts and assessing their results: unit tests for regular Java methods
+call those methods directly with plain JUnit assertions, and no non-script
+assertion helpers may be added to `AwkTestSupport`.
 
 ## Code quality reports
 

pom.xml

@@ -96,12 +96,6 @@
 
 	<dependencies>
 
-		<dependency>
-			<groupId>org.metricshub</groupId>
-			<artifactId>printf4j</artifactId>
-			<version>0.9.08</version>
-		</dependency>
-
 		<dependency>
 			<groupId>com.github.stefanbirkner</groupId>
 			<artifactId>system-rules</artifactId>

src/main/java/io/jawk/backend/AVM.java

@@ -1785,7 +1785,7 @@ private void executeTuples(PositionTracker position)
 				}
 				case INTFUNC: {
 					// stack[0] = arg to int() function
-					push((long) JRT.toDouble(pop()));
+					push(JRT.truncateToScalar(JRT.toDouble(pop())));
 					position.next();
 					break;
 				}
@@ -3003,7 +3003,7 @@ private Object invokeIndirectBuiltin(
 			return jrt.index(jrt.toAwkString(args[0]), jrt.toAwkString(args[1]));
 		case INT:
 			requireIndirectArgumentCount(builtin, args, 1, 1, lineNumber);
-			return Long.valueOf((long) JRT.toDouble(args[0]));
+			return JRT.truncateToScalar(JRT.toDouble(args[0]));
 		case LENGTH:
 			requireIndirectArgumentCount(builtin, args, 0, 1, lineNumber);
 			return args.length == 0 ? Integer.valueOf(jrt.jrtGetInputField(0).toString().length()) : lengthOf(args[0]);
@@ -3029,7 +3029,6 @@ private Object invokeIndirectBuiltin(
 		case SPRINTF:
 			requireIndirectArgumentCount(builtin, args, 1, Integer.MAX_VALUE, lineNumber);
 			return jrt
-					.getAwkSink()
 					.sprintf(
 							jrt.toAwkString(args[0]),
 							Arrays.copyOfRange(args, 1, args.length));
@@ -3784,7 +3783,7 @@ private Object[] popArguments(long numArgs) {
 	private String sprintfFunction(long numArgs) {
 		Object[] argArray = popArguments(numArgs - 1);
 		String fmt = jrt.toAwkString(pop());
-		return jrt.getAwkSink().sprintf(fmt, argArray);
+		return jrt.sprintf(fmt, argArray);
 	}
 
 	private void setNumOnJRT(long fieldNum, double num) {

src/main/java/io/jawk/intermediate/AwkTuples.java

@@ -2383,55 +2383,37 @@ private Object foldBinary(Object left, Object right, Tuple operation) {
 			double d1 = JRT.toDouble(left);
 			double d2 = JRT.toDouble(right);
 			double ans = d1 + d2;
-			if (JRT.isActuallyLong(ans)) {
-				return Long.valueOf((long) Math.rint(ans));
-			}
-			return Double.valueOf(ans);
+			return JRT.toScalarNumber(ans);
 		}
 		case SUBTRACT: {
 			double d1 = JRT.toDouble(left);
 			double d2 = JRT.toDouble(right);
 			double ans = d1 - d2;
-			if (JRT.isActuallyLong(ans)) {
-				return Long.valueOf((long) Math.rint(ans));
-			}
-			return Double.valueOf(ans);
+			return JRT.toScalarNumber(ans);
 		}
 		case MULTIPLY: {
 			double d1 = JRT.toDouble(left);
 			double d2 = JRT.toDouble(right);
 			double ans = d1 * d2;
-			if (JRT.isActuallyLong(ans)) {
-				return Long.valueOf((long) Math.rint(ans));
-			}
-			return Double.valueOf(ans);
+			return JRT.toScalarNumber(ans);
 		}
 		case DIVIDE: {
 			double d1 = JRT.toDouble(left);
 			double d2 = JRT.toDouble(right);
 			double ans = d1 / d2;
-			if (JRT.isActuallyLong(ans)) {
-				return Long.valueOf((long) Math.rint(ans));
-			}
-			return Double.valueOf(ans);
+			return JRT.toScalarNumber(ans);
 		}
 		case MOD: {
 			double d1 = JRT.toDouble(left);
 			double d2 = JRT.toDouble(right);
 			double ans = d1 % d2;
-			if (JRT.isActuallyLong(ans)) {
-				return Long.valueOf((long) Math.rint(ans));
-			}
-			return Double.valueOf(ans);
+			return JRT.toScalarNumber(ans);
 		}
 		case POW: {
 			double d1 = JRT.toDouble(left);
 			double d2 = JRT.toDouble(right);
 			double ans = Math.pow(d1, d2);
-			if (JRT.isActuallyLong(ans)) {
-				return Long.valueOf((long) Math.rint(ans));
-			}
-			return Double.valueOf(ans);
+			return JRT.toScalarNumber(ans);
 		}
 		case CMP_EQ:
 		case CMP_LT:
@@ -2462,17 +2444,11 @@ private Object foldUnary(Object literal, Tuple operation) {
 		case NEGATE: {
 			double value = JRT.toDouble(literal);
 			double ans = -value;
-			if (JRT.isActuallyLong(ans)) {
-				return Long.valueOf((long) Math.rint(ans));
-			}
-			return Double.valueOf(ans);
+			return JRT.toScalarNumber(ans);
 		}
 		case UNARY_PLUS: {
 			double value = JRT.toDouble(literal);
-			if (JRT.isActuallyLong(value)) {
-				return Long.valueOf((long) Math.rint(value));
-			}
-			return Double.valueOf(value);
+			return JRT.toScalarNumber(value);
 		}
 		default:
 			return null;
@@ -2488,11 +2464,11 @@ private Tuple createLiteralPush(Object value, int lineNumber) {
 		} else if (value instanceof Double) {
 			tuple = new Tuple.PushDoubleTuple(((Double) value).doubleValue());
 		} else if (value instanceof Number) {
-			double d = ((Number) value).doubleValue();
-			if (JRT.isActuallyLong(d)) {
-				tuple = new Tuple.PushLongTuple((long) Math.rint(d));
+			Object scalar = JRT.toScalarNumber(((Number) value).doubleValue());
+			if (scalar instanceof Long) {
+				tuple = new Tuple.PushLongTuple(((Long) scalar).longValue());
 			} else {
-				tuple = new Tuple.PushDoubleTuple(d);
+				tuple = new Tuple.PushDoubleTuple(((Double) scalar).doubleValue());
 			}
 		} else if (value instanceof String) {
 			tuple = new Tuple.PushStringTuple((String) value);

src/main/java/io/jawk/jrt/AppendableAwkSink.java

@@ -89,10 +89,10 @@ public void print(String ofs, String ors, String ofmt, Object... values) throws
 	}
 
 	@Override
-	public void printf(String ofs, String ors, String ofmt, String format, Object... values)
+	public void printf(String ofs, String ors, String ofmt, String convfmt, String format, Object... values)
 			throws IOException {
 		synchronized (lock) {
-			appendable.append(formatPrintfResult(format, values));
+			appendable.append(sprintf(convfmt, format, values));
 		}
 	}