Skip to content

Commit 955c090

Browse files
yutaro-sakamotoyutaro-sakamoto
authored
Merge pull request #194 from opensourcecobol/develop
Release v1.0.13
2 parents 837dedd + a637c6a commit 955c090

File tree

104 files changed

+16788
-779
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

104 files changed

+16788
-779
lines changed

‎.github/workflows/cicd.yml

+13-23
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
name: test
2+
23
on:
34
push:
45
pull_request:
56
types: [opened, reopened, review_requested, synchronize]
6-
7+
8+
env:
9+
CLASSPATH: ":/usr/lib/opensourcecobol4j/libcobj.jar:/usr/lib/sqlite.jar"
10+
711
jobs:
812
run-tests:
913
strategy:
@@ -27,79 +31,65 @@ jobs:
2731
dnf install -y java-17-openjdk-devel gcc gcc-c++ make bison flex automake autoconf diffutils gettext
2832
2933
- name: Checkout opensource COBOL 4J
30-
uses: actions/checkout@v2
34+
uses: actions/checkout@v3
3135

3236
- name: Install opensource COBOL 4J
3337
run: |
34-
mkdir ~/.java_lib
35-
curl -L -o ~/.java_lib/sqlite.jar https://github.com/xerial/sqlite-jdbc/releases/download/3.36.0.3/sqlite-jdbc-3.36.0.3.jar
36-
export CLASSPATH=":$HOME/.java_lib/sqlite.jar"
38+
curl -L -o /usr/lib/sqlite.jar -k https://github.com/xerial/sqlite-jdbc/releases/download/3.36.0.3/sqlite-jdbc-3.36.0.3.jar
3739
./configure --prefix=/usr/
3840
make
3941
make install
40-
export CLASSPATH=":/usr/lib/opensourcecobol4j/libcobj.jar:$HOME/.java_lib/sqlite.jar"
4142
4243
- name: Run tests "command-line-options"
4344
run: |
44-
export CLASSPATH=":/usr/lib/opensourcecobol4j/libcobj.jar:$HOME/.java_lib/sqlite.jar"
4545
cd tests/
4646
./command-line-options
47-
cd ../
4847
4948
- name: Run tests "misc"
5049
run: |
51-
export CLASSPATH=":/usr/lib/opensourcecobol4j/libcobj.jar:$HOME/.java_lib/sqlite.jar"
5250
cd tests/
5351
./misc
54-
cd ../
5552
5653
- name: Run tests "data-rep"
5754
run: |
58-
export CLASSPATH=":/usr/lib/opensourcecobol4j/libcobj.jar:$HOME/.java_lib/sqlite.jar"
5955
cd tests/
6056
./data-rep
61-
cd ../
6257
6358
- name: Run tests "i18n_sjis"
6459
run: |
65-
export CLASSPATH=":/usr/lib/opensourcecobol4j/libcobj.jar:$HOME/.java_lib/sqlite.jar"
6660
cd tests/
6761
./i18n_sjis
6862
6963
- name: Run tests "jp-compat"
7064
run: |
71-
export CLASSPATH=":/usr/lib/opensourcecobol4j/libcobj.jar:$HOME/.java_lib/sqlite.jar"
7265
cd tests/
7366
./jp-compat
74-
cd ../
7567
7668
- name: Run tests "run"
7769
run: |
78-
export CLASSPATH=":/usr/lib/opensourcecobol4j/libcobj.jar:$HOME/.java_lib/sqlite.jar"
7970
cd tests/
8071
./run
81-
cd ../
8272
8373
- name: Run tests "syntax"
8474
run: |
85-
export CLASSPATH=":/usr/lib/opensourcecobol4j/libcobj.jar:$HOME/.java_lib/sqlite.jar"
8675
cd tests/
8776
./syntax
88-
cd ../
8977
9078
- name: Run NIST test
9179
run: |
92-
export CLASSPATH=":/usr/lib/opensourcecobol4j/libcobj.jar:$HOME/.java_lib/sqlite.jar"
9380
cd tests/cobol85
9481
make test
9582
83+
- name: Run Extra NIST test
84+
run: |
85+
cd tests/cobol85
86+
make test-extra
87+
9688
#- name: Run tests "i18n_utf8"
9789
# run: |
98-
# export CLASSPATH=":$HOME/.java_lib/sqlite.jar"
9990
# ./configure --prefix=/usr/ --with-vbisam --enable-utf8
10091
# make
10192
# make install
102-
# export CLASSPATH=":/usr/lib/opensourcecobol4j/libcobj.jar:$HOME/.java_lib/sqlite.jar"
10393
# ./i18n_utf8 || true
10494
# cd ../
10595
@@ -108,7 +98,7 @@ jobs:
10898
steps:
10999
# Checkout opensource COBOL
110100
- name: Checkout opensource COBOL 4J
111-
uses: actions/checkout@v2
101+
uses: actions/checkout@v3
112102

113103
- uses: actions/setup-java@v3
114104
with:

‎CHANGELOG.md

+32-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,38 @@ All notable changes to this project will be documented in this file.
44

55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
66

7-
## [1.0.12]
7+
## [1.0.13] - 2023-07-31
8+
### Added
9+
- Add new options
10+
- Add `-debug` option (#146)
11+
- Add `-Wparentheses` (#182)
12+
- Add `-Wcolumn-overflow` (#184)
13+
- Add `-fmfcomment` (#185)
14+
- Add `-ffunctions-all` (#188)
15+
- Implement `COB_IO_ASSUME_REWRITE` (#166)
16+
- Output version strings in generated Java files (#153)
17+
### Fixed
18+
- Allow string literals to be used as a call parameter (#127)
19+
- Fix displaying numbers (#138)
20+
- Fix the bug of COMPUTE statement (#143)
21+
- Fix `EXIT PERFORM CYCLE` (#150)
22+
- Fix SORT statement (#151)
23+
- Fix functions `CURRENT-DATE` and `SYSTEM` (#162)
24+
- Fix the bug of COMPUTE statement for `COMP-3` (#186)
25+
- Fix non-NIST tests
26+
- Fix `i18n_sjis`and `data-rep` (#141)
27+
- Fix `syntax` (#142, #172)
28+
- Fix `jp-compat` (#141, #149, #161)
29+
- Fix `run` (#169, #172, #180)
30+
### Optimized
31+
- Optimize ADD statement and SUBTRACT statement (#133)
32+
- Optimize comparison of `PIC S9(n)V(m)` (#143)
33+
- Implement the precomputation for `CobolDataStorage` (#163)
34+
### Changed
35+
- Improve the variable names in generated Java files
36+
- Update tests for NIST COBOL85 tests (#135)
37+
- Refactor generated Java files (#125)
38+
## [1.0.12] - 2023-06-30
839
### Added
940
- Run NIST85 tests for Relative files and add the test status to README.md
1041
- Add CHANGELOG.md (#119)

‎ChangeLog

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
2023-07-31 OSS Consortium <ws-opensource-cobol-contact@osscons.jp>
2+
3+
* opensource COBOL 4J v1.0.13 released.
4+
15
2023-06-30 OSS Consortium <ws-opensource-cobol-contact@osscons.jp>
26

37
* opensource COBOL 4J v1.0.12 released.

‎Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
bin_SCRIPTS =
2626

27-
include_HEADERS = libcob.h
27+
include_HEADERS = libcobj.h
2828

2929
#SUBDIRS = lib cobj config copy po texi tests libcobj
3030
SUBDIRS = lib cobj bin config copy texi tests libcobj

‎Makefile.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,7 @@ top_build_prefix = @top_build_prefix@
417417
top_builddir = @top_builddir@
418418
top_srcdir = @top_srcdir@
419419
bin_SCRIPTS =
420-
include_HEADERS = libcob.h
420+
include_HEADERS = libcobj.h
421421

422422
#SUBDIRS = lib cobj config copy po texi tests libcobj
423423
SUBDIRS = lib cobj bin config copy texi tests libcobj

‎NEWS

+32
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,38 @@ NEWS - user visible changes -*- outline -*-
22

33
-----------------------------------------------------------------------
44

5+
* opensource COBOL 4J 1.0.13
6+
7+
** New Features
8+
(1) Add -debug option
9+
(2) Add -Wparentheses option
10+
(3) Add -Wcolumn-overflow option
11+
(4) Add -fmfcomment option
12+
(5) Add -ffunctions-all option
13+
(6) Implement COB_IO_ASSUME_REWRITE
14+
(7) Output version strings in generated Java files
15+
16+
** Improve Performance
17+
(1) Optimize ADD statement and SUBTRACT statement
18+
(2) Optimize comparison of PIC S9(n)V(m)
19+
(3) Implement the precomputation for CobolDataStorage
20+
21+
** Bug fixes
22+
(1) Fix non-NIST tests
23+
(2) Fix CALL parameter
24+
(3) Fix COMPUTE statement
25+
(4) Fix SORT statement
26+
(5) Fix EXIT PERFORM CYCLE
27+
(6) Fix functions CURRENT-DATE and SYSTEM
28+
(1) Fix displaying numbers
29+
30+
** Miscellaneous
31+
(1) Improve the variable names in generated Java files
32+
(2) Update tests for NIST COBOL85 tests
33+
(3) Refactor generated Java files
34+
35+
-----------------------------------------------------------------------
36+
537
* opensource COBOL 4J 1.0.12
638

739
** New Features

‎README.md

+24-11
Original file line numberDiff line numberDiff line change
@@ -49,26 +49,39 @@ Implemented.
4949

5050
opensource COBOL 4J is tested using [NIST COBOL85 test suite](https://www.itl.nist.gov/div897/ctg/cobol_form.htm)
5151

52-
The result of NIST COBOL85 test suite
52+
The result of NIST COBOL85 main test suites
5353

5454
```
5555
------ Directory Information ------- --- Total Tests Information ---
5656
Module Programs Executed Error Crash Pass Fail Deleted Inspect Total
5757
------ -------- -------- ----- ----- ----- ---- ------- ------- -----
58-
NC 90 90 0 0 4352 0 6 11 4369
59-
SM 15 15 0 0 290 0 3 1 294
60-
IC 13 13 0 0 97 0 0 0 97
61-
SQ 81 81 0 0 512 0 6 81 599
62-
IX 39 39 0 0 507 0 1 0 508
63-
ST 39 39 0 0 278 0 0 0 278
64-
SG 5 5 0 0 193 0 0 0 193
65-
OB 5 5 0 0 16 0 0 0 16
66-
IF 42 42 0 0 732 0 0 0 732
67-
RL 32 32 0 0 1827 0 5 0 1832
58+
NC 90 90 0 0 4352 0 6 11 4369 COBOL nucleus tests
59+
SM 15 15 0 0 290 0 3 1 294 COPY sentence tests
60+
IC 13 13 0 0 97 0 0 0 97 CALL sentence tests
61+
SQ 81 81 0 0 512 0 6 81 599 Sequential file I-O tests
62+
IX 39 39 0 0 507 0 1 0 508 Indexed file I-O tests
63+
ST 39 39 0 0 278 0 0 0 278 SORT sentence tests
64+
SG 5 5 0 0 193 0 0 0 193 Segment tests
65+
OB 5 5 0 0 16 0 0 0 16 Obsolete facilities tests
66+
IF 42 42 0 0 732 0 0 0 732 Intrinsic Function tests
67+
RL 32 32 0 0 1827 0 5 0 1832 Relative file I-O tests
6868
------ -------- -------- ----- ----- ----- ---- ------- ------- -----
6969
Total 361 361 0 0 8804 0 21 93 8918
7070
```
7171

72+
The result of nist cobol85 extra test suites
73+
74+
```
75+
------ directory information ------- --- total tests information ---
76+
module programs executed error crash pass fail deleted inspect total
77+
------ -------- -------- ----- ----- ----- ---- ------- ------- -----
78+
cm 7 0 7 0 0 0 0 0 0 COMMUNICATION SECTION tests
79+
db 10 0 10 0 0 0 0 0 0 Debugging facilities tests
80+
rw 4 0 4 0 0 0 0 0 0 REPORT SECTION tests
81+
------ -------- -------- ----- ----- ----- ---- ------- ------- -----
82+
total 21 0 21 0 0 0 0 0 0
83+
```
84+
7285
# Contributors
7386

7487
See https://github.com/opensourcecobol/opensourcecobol4j/graphs/contributors

‎README_JP.md

+24-11
Original file line numberDiff line numberDiff line change
@@ -48,26 +48,39 @@ java [PROGRAM-ID]
4848
opensource COBOL 4Jは[NIST COBOL85 test suite](https://www.itl.nist.gov/div897/ctg/cobol_fo
4949
rm.htm)によりテストされています。
5050

51-
テスト結果
51+
主要テスト結果
5252

5353
```
5454
------ Directory Information ------- --- Total Tests Information ---
5555
Module Programs Executed Error Crash Pass Fail Deleted Inspect Total
5656
------ -------- -------- ----- ----- ----- ---- ------- ------- -----
57-
NC 90 90 0 0 4352 0 6 11 4369
58-
SM 15 15 0 0 290 0 3 1 294
59-
IC 13 13 0 0 97 0 0 0 97
60-
SQ 81 81 0 0 512 0 6 81 599
61-
IX 39 39 0 0 507 0 1 0 508
62-
ST 39 39 0 0 278 0 0 0 278
63-
SG 5 5 0 0 193 0 0 0 193
64-
OB 5 5 0 0 16 0 0 0 16
65-
IF 42 42 0 0 732 0 0 0 732
66-
RL 32 32 0 0 1827 0 5 0 1832
57+
NC 90 90 0 0 4352 0 6 11 4369 COBOLの中核機能のテスト
58+
SM 15 15 0 0 290 0 3 1 294 COPY句のテスト
59+
IC 13 13 0 0 97 0 0 0 97 CALL文のテスト
60+
SQ 81 81 0 0 512 0 6 81 599 Sequentialファイルの入出力テスト
61+
IX 39 39 0 0 507 0 1 0 508 Indexedファイルの入出力テスト
62+
ST 39 39 0 0 278 0 0 0 278 SORT文のテスト
63+
SG 5 5 0 0 193 0 0 0 193 セグメントのテスト
64+
OB 5 5 0 0 16 0 0 0 16 廃止された機能のテスト
65+
IF 42 42 0 0 732 0 0 0 732 組み込み関数のテスト
66+
RL 32 32 0 0 1827 0 5 0 1832 Relativeファイルの入出力テスト
6767
------ -------- -------- ----- ----- ----- ---- ------- ------- -----
6868
Total 361 361 0 0 8804 0 21 93 8918
6969
```
7070

71+
その他のテストの結果
72+
73+
```
74+
------ directory information ------- --- total tests information ---
75+
module programs executed error crash pass fail deleted inspect total
76+
------ -------- -------- ----- ----- ----- ---- ------- ------- -----
77+
cm 7 0 7 0 0 0 0 0 0 COMMUNICATION SECTIONのテスト
78+
db 10 0 10 0 0 0 0 0 0 Debugging機能のテスト
79+
rw 4 0 4 0 0 0 0 0 0 REPORT SECTIONのテスト
80+
------ -------- -------- ----- ----- ----- ---- ------- ------- -----
81+
total 21 0 21 0 0 0 0 0 0
82+
```
83+
7184
# コントリビュータ
7285

7386
https://github.com/opensourcecobol/opensourcecobol4j/graphs/contributors を参照してください.

‎cobj/cobj.c

+1
Original file line numberDiff line numberDiff line change
@@ -771,6 +771,7 @@ static void cobc_print_usage(void) {
771771
puts(_(" -free_1col_aster Use free(1col_aster) source "
772772
"format"));
773773
puts(_(" -g Enable Java compiler debug"));
774+
puts(_(" -debug Enable all run-time error checking"));
774775
puts(_(" -o <dir>, -class-file-dir=<dir> Place class files into <dir>"));
775776
puts(_(" -j <dir>, -java-source-dir=<dir> Place Java files into <dir>"));
776777
puts(_(" -E Preprocess only; do not compile "

‎cobj/cobj.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#include <stdio.h>
2626

2727
#include "lib/gettext.h"
28-
#include "libcob.h"
28+
#include "libcobj.h"
2929

3030
#if !defined(__i386__) && !defined(__x86_64__) && !defined(__powerpc__) && \
3131
!defined(__powerpc64__) && !defined(__ppc__) && !defined(__amd64__)

0 commit comments

Comments
 (0)