Skip to content

Added funcDateToYyyymmdd and funcDayToYyyyddd in CobolIntrinsic.java . #216

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
yutaro-sakamoto merged 8 commits into from
Aug 31, 2023
Merged

Added funcDateToYyyymmdd and funcDayToYyyyddd in CobolIntrinsic.java . #216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4b3975c
Added funcConcatenate in CobolIntrinsic.java .
Aug 24, 2023
eccefde
Fixed CobolIntrinsic.java .
Aug 25, 2023
db9274d
Added functions in CobolIntrinsic.java .
Aug 29, 2023
0e3d4c2
Fixed funcConcatenate().
Aug 29, 2023
b81b7c5
Added funcDayToYyyyddd, funcDateToYyyymmdd int CobolIntrinsic.java .
Aug 29, 2023
edadcc0
Merge branch 'test-functions2' into test-functions3
Aug 29, 2023
62fd5f8
Fixed CobolIntrinsic.java .
Aug 29, 2023
2f3982a
Merge branch 'develop' into test-functions3
kio-watanabe Aug 30, 2023
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
122 changes: 122 additions & 0 deletions libcobj/src/jp/osscons/opensourcecobol/libcobj/common/CobolIntrinsic.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
package jp.osscons.opensourcecobol.libcobj.common;

import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.Arrays;
import java.util.Calendar;
import java.util.Random;
Expand Down Expand Up @@ -1770,4 +1771,125 @@ public static AbstractCobolField funcConcatenate(
}
return currField;
}

/**
* cob_intr_date_to_yyyymmddの実装
*
* @param params
* @param fields
* @return
*/
public static AbstractCobolField funcDateToYyyymmdd(int params, AbstractCobolField... fields) {
int year;
int mmdd;
int interval;
int xqtyear;
int maxyear;
LocalDateTime timeptr;

CobolFieldAttribute attr =
new CobolFieldAttribute(CobolFieldAttribute.COB_TYPE_NUMERIC_BINARY, 8, 0, 0, null);
AbstractCobolField field = CobolFieldFactory.makeCobolField(4, (CobolDataStorage) null, attr);
makeFieldEntry(field);
year = fields[0].getInt();
mmdd = year % 10000;
year /= 10000;
if (params > 1) {
interval = fields[1].getInt();
} else {
interval = 50;
}
if (params > 2) {
xqtyear = fields[2].getInt();
} else {
timeptr = CobolUtil.localtime();
xqtyear = 1900 + timeptr.getDayOfYear();
}
if (year < 0 || year > 999999) {
CobolRuntimeException.setException(CobolExceptionId.COB_EC_ARGUMENT_FUNCTION);
currField.setInt(0);
return currField;
}
if (xqtyear < 1601 || xqtyear > 9999) {
CobolRuntimeException.setException(CobolExceptionId.COB_EC_ARGUMENT_FUNCTION);
currField.setInt(0);
return currField;
}
maxyear = xqtyear + interval;
if (maxyear < 1700 || maxyear > 9999) {
CobolRuntimeException.setException(CobolExceptionId.COB_EC_ARGUMENT_FUNCTION);
currField.setInt(0);
return currField;
}
if (maxyear % 100 >= year) {
year += 100 * (maxyear / 100);
} else {
year += 100 * ((maxyear / 100) - 1);
}
year *= 10000;
year += mmdd;
currField.setInt(year);
return currField;
}

/**
* cob_intr_day_to_yyyydddの実装
*
* @param params
* @param fields
* @return
*/
public static AbstractCobolField funcDayToYyyyddd(int params, AbstractCobolField... fields) {
int year;
int days;
int interval;
int xqtyear;
int maxyear;
LocalDateTime timeptr;

CobolFieldAttribute attr =
new CobolFieldAttribute(CobolFieldAttribute.COB_TYPE_NUMERIC_BINARY, 8, 0, 0, null);
AbstractCobolField field = CobolFieldFactory.makeCobolField(4, (CobolDataStorage) null, attr);
makeFieldEntry(field);
year = fields[0].getInt();
days = year % 1000;
year /= 1000;
if (params > 1) {
interval = fields[1].getInt();
} else {
interval = 50;
}
if (params > 2) {
xqtyear = fields[2].getInt();
} else {
timeptr = CobolUtil.localtime();
xqtyear = 1900 + timeptr.getDayOfYear();
}

if (year < 0 || year > 999999) {
CobolRuntimeException.setException(CobolExceptionId.COB_EC_ARGUMENT_FUNCTION);
currField.setInt(0);
return currField;
}
if (xqtyear < 1601 || xqtyear > 9999) {
CobolRuntimeException.setException(CobolExceptionId.COB_EC_ARGUMENT_FUNCTION);
currField.setInt(0);
return currField;
}
maxyear = xqtyear + interval;
if (maxyear < 1700 || maxyear > 9999) {
CobolRuntimeException.setException(CobolExceptionId.COB_EC_ARGUMENT_FUNCTION);
currField.setInt(0);
return currField;
}
if (maxyear % 100 >= year) {
year += 100 * (maxyear / 100);
} else {
year += 100 * ((maxyear / 100) - 1);
}
year *= 1000;
year += days;
currField.setInt(year);
return currField;
}
}
2 changes: 0 additions & 2 deletions tests/run.src/functions.at
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,6 @@ AT_CHECK([java prog], [0],
AT_CLEANUP

AT_SETUP([FUNCTION DATE-TO-YYYYMMDD])
AT_CHECK([${SKIP_TEST}])

AT_DATA([prog.cob], [
IDENTIFICATION DIVISION.
Expand Down Expand Up @@ -335,7 +334,6 @@ AT_CHECK([java prog], [0],
AT_CLEANUP

AT_SETUP([FUNCTION DAY-TO-YYYYDDD])
AT_CHECK([${SKIP_TEST}])

AT_DATA([prog.cob], [
IDENTIFICATION DIVISION.
Expand Down