Skip to content
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

Initial JNI configuration #157

Open
wants to merge 20 commits into
base: java-interop
Choose a base branch
from
Open

Initial JNI configuration #157

Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
7dbe688
Initial handling of calls to static Java methods
xevor11 Jul 9, 2024
8ac6f69
Adjust check for linking with JVM library
nberth Aug 22, 2024
70f22e1
added runtime checks in java.c
xevor11 Aug 23, 2024
b7b8b42
Implemented logic in parser.y to detect malformed errors and unsuppor…
xevor11 Aug 23, 2024
1493f2f
Added updates to ChangeLog and a description to .texi file
xevor11 Aug 23, 2024
0c1eb53
Refactored malformed checks in parser
xevor11 Sep 2, 2024
ea840e3
Added test for invalid name
xevor11 Sep 9, 2024
3cfe83d
Fix simple tests and adjust runtime error handling
nberth Sep 12, 2024
bb76d66
Minor Adjustments
xevor11 Sep 15, 2024
c1944d1
Updated documentation, fixed exception handling
xevor11 Sep 15, 2024
85be0ef
Updated codegen, parser, and java handling. Removed m4/ax_prog_javac.m4.
xevor11 Oct 18, 2024
694669b
Removed '_' checks and added test for package
xevor11 Oct 29, 2024
86b62c3
Updated output_java_call and cb_check_conformance
xevor11 Nov 12, 2024
708c0e4
Reintroduce `m4/ax_prog.javac.m4`
nberth Nov 5, 2024
9e9c908
Fix and reformat in `libcob/java.c`
nberth Nov 5, 2024
8b142f5
Quick fix in code generation
nberth Nov 5, 2024
56aac26
Try and fix loading of `libjvm` for older JREs, and JNI code
nberth Nov 6, 2024
35e8c3b
Fix reporting of failures to load Java interoperability module
nberth Nov 6, 2024
caf9f31
Fix check in `cb_check_conformance`
nberth Nov 12, 2024
78262a1
Use fully qualified Java class names
nberth Nov 12, 2024
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
17 changes: 8 additions & 9 deletions cobc/parser.y
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12257,15 +12257,14 @@ call_body:
char* s = (char *)CB_LITERAL ($3)->data;
if (strncasecmp("Java.", s, 5) == 0) {
call_conv = CB_CONV_JAVA;
}
/* Check for malformed Java method names */
char* class_and_method_name = s + 5;
if (strchr(class_and_method_name, '.') == NULL) {
cb_error_x ($3, _("malformed Java method name '%s', expected format 'Java.ClassName.methodName'"), s);
}
/* Check for unsupported Java method calls with parameters or return values */
if($7 != NULL || $8 != NULL) {
CB_PENDING("Java method calls with parameters or return values");
/* Check for malformed Java method names */
if (strchr(s + 5, '.') == NULL) {
cb_error_x ($3, _("malformed Java method name '%s', expected format 'Java.ClassName.methodName'"), s);
GitMensch marked this conversation as resolved.
Show resolved Hide resolved
}
/* Check for unsupported Java method calls with parameters or return values */
if($7 != NULL || $8 != NULL) {
CB_PENDING("Java method calls with parameters or return values");
}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

move this code to cb_check_conformance, ideally adding the conformance checks for the allowed types already

}
cb_check_conformance ($3, $7, $8);
} else if (CB_REFERENCE_P ($3)) {
Expand Down