requested changes to java.c, configure.ac, and internal state to cobl… by xevor11 · Pull Request #150 · OCamlPro/gnucobol

xevor11 · 2024-06-12T22:07:20Z

Rebased and Made requested changes in PR #149

…ocal.h Fixed conflicts

GitMensch

please add an entry to DEPENDENCIES about the new optional dependency, and an entry to ChangeLog and libcob/ChangeLog; this will also make it easier to understand what you added why

Please just update your source branch, currently jni-correct and those commits will land in here.

GitMensch · 2024-06-16T19:23:00Z

configure.ac

+
+AC_PATH_PROG(javahome,java, "/usr/bin")
+javahome=`dirname ${javahome}`
+javahome=`dirname ${javahome}`


Why twice?
Do we need this for anything later on?

That was by accident, however I was slightly confused about the formatting

GitMensch · 2024-06-16T19:24:58Z

configure.ac

+AC_CHECK_HEADERS([jni.h], [],
+  [AC_MSG_ERROR([jni.h is required but could not be found])])
+AC_CHECK_HEADERS([jni_md.h], [],
+  [AC_MSG_ERROR([jni_md.h is required but could not be found])])


We can leave this as-is for now, later on it should only be done if --with-java is specified.
You may opt to do this part after your mid-term evaluation, whenever you do check how --with-xml2 is handled.

GitMensch · 2024-06-16T19:28:08Z

libcob/Makefile.am

+lib_LTLIBRARIES = libcob.la
+libcob_la_SOURCES = common.c move.c numeric.c strings.c \
+	fileio.c call.c intrinsic.c termio.c screenio.c reportio.c cobgetopt.c \
+	java.c \
+	mlio.c coblocal.h cconv.c system.def profiling.c


you likely just wanted to add java.c to the list below; later on you may include it conditional on a variable (similar but not identical to libodbci).

In any case that's an adjustment, so please add ,2024 to the copyright year of this file

GitMensch · 2024-06-16T19:31:38Z

libcob/coblocal.h

 /*
-   Copyright (C) 2007-2012, 2014-2022 Free Software Foundation, Inc.
-   Written by Roger While, Simon Sobisch, Ron Norman
+   Copyright (C) 2007-2012, 2014-2024 Free Software Foundation, Inc.


we don't just include year numbers, so until @ddeclerck has reached a state where he considers to have many important commit merges done (or you miss a specific 3.x commit that he already merged) and we rebase the java-interop branch which likely will add 2023 commits, the change should say ,2024`.

GitMensch · 2024-06-16T19:32:18Z

libcob/coblocal.h

+COB_HIDDEN char*        cob_get_strerror (void);
+
+COB_HIDDEN JNIEnv*	cob_create_vm					();
+COB_HIDDEN void	cob_handle_error		(JavaVM* jvm, char* methodSig);
+COB_HIDDEN char* cob_gen_method_sig		(const char** paramType, int paramCount, const char** returnType);
+
+COB_HIDDEN void cob_lookup_static_method		(JNIEnv* env, JavaVM* jvm, const char *className, const char *methodName, 
+                              const char *methodSig, const char *returnType, const char** paramTypes, int paramCount);
+
+COB_HIDDEN void cob_static_method		(JNIEnv* env, JavaVM* jvm, jclass cls, jmethodID mid);
+COB_HIDDEN void cob_call_java_static_method		(JNIEnv *env, JavaVM *jvm, const char *className, const char *methodName, jobject obj, jstring input);
+
+enum cob_case_modifier {
+	CCM_NONE,
+	CCM_LOWER,
+	CCM_UPPER,
+	CCM_LOWER_LOCALE,
+	CCM_UPPER_LOCALE
+};
+COB_HIDDEN unsigned char	cob_toupper (const unsigned char);
+COB_HIDDEN unsigned char	cob_tolower (const unsigned char);
+COB_HIDDEN int		cob_field_to_string	(const cob_field *, void *,
+						 const size_t, const enum cob_case_modifier target_case);


something has gone wrong here - see the same content directly above

I do not see any duplicates in the file?

cob_field_to_string is duplicate, cob_tolower/cob_toupper/cob_get_strerror/cob_case_modifier are shown to be added while not related to this PR

I might have changed the line number causing get strerror and the enum to appear in the PR

…G and DEPENDENCIES

xevor11 · 2024-06-17T04:23:45Z

Added the requested changes

GitMensch · 2024-06-17T05:32:25Z

Do you have a first working call to Java (which likely includes and adjustment to call.c as well), maybe System.getProperty("java.version") which is then DISPLAYed by COBOL?

…rectional communication

xevor11 · 2024-07-01T15:57:31Z

More changes for the following:

Integrated JNI with java.c by adding types and data structures in java.c for bidirectional communication

Working towards:

Do you have a first working call to Java (which likely includes and adjustment to call.c as well), maybe System.getProperty("java.version") which is then DISPLAYed by COBOL?

nberth · 2024-07-05T11:52:04Z

libcob/java.c

-    jclass cls;
-    jmethodID mid;
-} MethodCache;
+#define HAVE_JNI


This should be defined by the configure script, but I guess this is a workaround until it is fully operative.

nberth · 2024-07-05T11:52:34Z

cobc/codegen.c

 static struct field_list	*local_field_cache = NULL;
 static struct call_list		*call_cache = NULL;
+extern JavaVM *jvm;
+extern JNIEnv *env;


I'm not sure these are needed in the compiler (cobc) itself.

nberth · 2024-07-05T11:53:52Z

cobc/codegen.c

+static void lookup_java_call(const char *p) {
+    struct call_list *clp;
+
+    for (clp = call_cache; clp; clp = clp->next) {


I think it's another list you need to manipulate in this function. Something like call_java_cache.

xevor11 · 2024-07-10T15:11:39Z

@GitMensch Here are the final changes, we fixed issues with autoconf, config and when make it runs without errors. We need to write some tests, but after that we can merge

nberth · 2024-07-10T16:48:16Z

@GitMensch Here are the final changes, we fixed issues with autoconf, config and when make it runs without errors. We need to write some tests, but after that we can merge

I guess you want to check #157 instead. This PR (#150) is outdated and can probably be closed.

GitMensch · 2024-07-11T08:47:30Z

closed in favor of duplicate #157

requested changes to java.c, configure.ac, and internal state to cobl…

e4b6f10

…ocal.h Fixed conflicts

GitMensch requested changes Jun 16, 2024

View reviewed changes

Requested changes in PR OCamlPro#149, added modifications to CHANGELO…

35f3ff4

…G and DEPENDENCIES

xevor11 added 2 commits June 17, 2024 09:55

Formatted Changes to PR

1409cdf

Added changes to java.c for adding types and data structures for bidi…

10761c7

…rectional communication

xevor11 added 4 commits July 1, 2024 13:48

Refactoring for generating static methods

1ef39f0

More Changes

e2722fc

Small Fix

2f20dea

Reverted all prior changes and cleaned up java.c

3b5d860

nberth reviewed Jul 5, 2024

View reviewed changes

Duplicate Methods

52c90d6

xevor11 mentioned this pull request Jul 9, 2024

Initial JNI configuration #157

Open

GitMensch closed this Jul 11, 2024

Conversation

xevor11 commented Jun 12, 2024

Uh oh!

GitMensch left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

GitMensch Jun 16, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

GitMensch Jun 17, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

xevor11 commented Jun 17, 2024

Uh oh!

GitMensch commented Jun 17, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

xevor11 commented Jul 1, 2024

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

xevor11 commented Jul 10, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

nberth commented Jul 10, 2024

Uh oh!

GitMensch commented Jul 11, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

GitMensch Jun 16, 2024 •

edited

Loading

GitMensch Jun 17, 2024 •

edited

Loading

GitMensch commented Jun 17, 2024 •

edited

Loading

xevor11 commented Jul 10, 2024 •

edited

Loading