Skip to content

#813 Fix compatibility of the relaxed sign overpunching. #814

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yruslan merged 2 commits into from
Jan 6, 2026
Merged

#813 Fix compatibility of the relaxed sign overpunching. #814

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4a63b30
#813 Fix compatibility of the relaxed sign overpunching.
yruslan Jan 6, 2026
82080f9
#813 Fix PR suggestions.
yruslan Jan 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions cobol-parser/src/main/scala/za/co/absa/cobrix/cobol/parser/decoders/DecoderSelector.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

package za.co.absa.cobrix.cobol.parser.decoders

import java.nio.charset.{Charset, StandardCharsets}
import za.co.absa.cobrix.cobol.parser.ast.datatype._
import za.co.absa.cobrix.cobol.parser.common.Constants
import za.co.absa.cobrix.cobol.parser.common.Constants.{maxIntegerPrecision, maxLongPrecision}
Expand All @@ -25,6 +24,7 @@ import za.co.absa.cobrix.cobol.parser.encoding._
import za.co.absa.cobrix.cobol.parser.encoding.codepage.{CodePage, CodePageCommon}
import za.co.absa.cobrix.cobol.parser.position.Position

import java.nio.charset.{Charset, StandardCharsets}
import scala.util.control.NonFatal

object DecoderSelector {
Expand Down Expand Up @@ -128,14 +128,14 @@ object DecoderSelector {
case None =>
if (decimalType.explicitDecimal) {
if (isEbcidic)
StringDecoders.decodeEbcdicBigDecimal(_, !isSigned, isSigned || !strictSignOverpunch, improvedNullDetection)
(bytes: Array[Byte]) => StringDecoders.decodeEbcdicBigDecimal(bytes, !isSigned, isSigned || !strictSignOverpunch, !strictSignOverpunch, improvedNullDetection)
else
StringDecoders.decodeAsciiBigDecimal(_, !isSigned, isSigned || !strictSignOverpunch, improvedNullDetection)
StringDecoders.decodeAsciiBigDecimal(_, !isSigned, isSigned || !strictSignOverpunch, !strictSignOverpunch, improvedNullDetection)
} else {
if (isEbcidic)
StringDecoders.decodeEbcdicBigNumber(_, !isSigned, isSigned || !strictSignOverpunch, improvedNullDetection, decimalType.scale, decimalType.scaleFactor)
(bytes: Array[Byte]) => StringDecoders.decodeEbcdicBigNumber(bytes, !isSigned, isSigned || !strictSignOverpunch, !strictSignOverpunch, improvedNullDetection, decimalType.scale, decimalType.scaleFactor)
else
StringDecoders.decodeAsciiBigNumber(_, !isSigned, isSigned || !strictSignOverpunch, improvedNullDetection, decimalType.scale, decimalType.scaleFactor)
StringDecoders.decodeAsciiBigNumber(_, !isSigned, isSigned || !strictSignOverpunch, !strictSignOverpunch, improvedNullDetection, decimalType.scale, decimalType.scaleFactor)
}
// case Some(COMP()) =>
// // COMP aka BINARY encoded number
Expand Down Expand Up @@ -207,24 +207,24 @@ object DecoderSelector {
case None =>
if (strictIntegralPrecision) {
if (isEbcidic)
StringDecoders.decodeEbcdicBigNumber(_, !isSigned, isSigned || !strictSignOverpunch, improvedNullDetection)
(bytes: Array[Byte]) => StringDecoders.decodeEbcdicBigNumber(bytes, !isSigned, isSigned || !strictSignOverpunch, !strictSignOverpunch, improvedNullDetection)
else
StringDecoders.decodeAsciiBigNumber(_, !isSigned, isSigned || !strictSignOverpunch, improvedNullDetection)
StringDecoders.decodeAsciiBigNumber(_, !isSigned, isSigned || !strictSignOverpunch, !strictSignOverpunch, improvedNullDetection)
} else if (integralType.precision <= Constants.maxIntegerPrecision) {
if (isEbcidic)
StringDecoders.decodeEbcdicInt(_, !isSigned, isSigned || !strictSignOverpunch, improvedNullDetection)
(bytes: Array[Byte]) => StringDecoders.decodeEbcdicInt(bytes, !isSigned, isSigned || !strictSignOverpunch, !strictSignOverpunch, improvedNullDetection)
else
StringDecoders.decodeAsciiInt(_, !isSigned, isSigned || !strictSignOverpunch, improvedNullDetection)
StringDecoders.decodeAsciiInt(_, !isSigned, isSigned || !strictSignOverpunch, !strictSignOverpunch, improvedNullDetection)
} else if (integralType.precision <= Constants.maxLongPrecision) {
if (isEbcidic)
StringDecoders.decodeEbcdicLong(_, !isSigned, isSigned || !strictSignOverpunch, improvedNullDetection)
StringDecoders.decodeEbcdicLong(_, !isSigned, isSigned || !strictSignOverpunch, !strictSignOverpunch, improvedNullDetection)
else
StringDecoders.decodeAsciiLong(_, !isSigned, isSigned || !strictSignOverpunch, improvedNullDetection)
StringDecoders.decodeAsciiLong(_, !isSigned, isSigned || !strictSignOverpunch, !strictSignOverpunch, improvedNullDetection)
} else {
if (isEbcidic)
StringDecoders.decodeEbcdicBigNumber(_, !isSigned, isSigned || !strictSignOverpunch, improvedNullDetection)
(bytes: Array[Byte]) => StringDecoders.decodeEbcdicBigNumber(bytes, !isSigned, isSigned || !strictSignOverpunch, !strictSignOverpunch, improvedNullDetection)
else
StringDecoders.decodeAsciiBigNumber(_, !isSigned, isSigned || !strictSignOverpunch, improvedNullDetection)
StringDecoders.decodeAsciiBigNumber(_, !isSigned, isSigned || !strictSignOverpunch, !strictSignOverpunch, improvedNullDetection)
}
// case Some(Constants.compBinary1) =>
// // COMP aka BINARY encoded number
Expand Down Expand Up @@ -267,11 +267,11 @@ object DecoderSelector {

if (isEbcdic) {
bytes: Array[Byte] => {
StringDecoders.decodeEbcdicNumber(bytes, !isSigned, allowedSignOverpunch, improvedNullDetection)
StringDecoders.decodeEbcdicNumber(bytes, !isSigned, allowedSignOverpunch, !strictSignOverpunch, improvedNullDetection)
}
} else {
bytes: Array[Byte] => {
StringDecoders.decodeAsciiNumber(bytes, !isSigned, allowedSignOverpunch, improvedNullDetection)
StringDecoders.decodeAsciiNumber(bytes, !isSigned, allowedSignOverpunch, !strictSignOverpunch, improvedNullDetection)
}
}
}
Expand Down
Loading
Loading