From c37f4b256adf577bd920c0461525d91279656141 Mon Sep 17 00:00:00 2001 From: Ian Blissard Date: Thu, 24 Mar 2016 15:08:11 -0400 Subject: [PATCH 1/2] Fix configure with --with-java-incs --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index bc315fc..da07cac 100755 --- a/configure +++ b/configure @@ -4939,7 +4939,7 @@ OFP_CURR_JDK_DIR="$OFP_JAVA_PATH" if test -n "$with_java_incs" ; then # the user supplied the include flags to configure with --with-java-incs - OFP_CFLAGS="$with_java_incs" + OFP_CFLAGS="-I$with_java_incs" OFP_ENABLE_C_ACTIONS="yes" else case "${host}" in From 4055d4085add2a043100c85898e34303e0e694c8 Mon Sep 17 00:00:00 2001 From: Ian Blissard Date: Wed, 30 Mar 2016 09:31:52 -0400 Subject: [PATCH 2/2] Fix parse error in generated C code --- src/fortran/ofp/cparser/CFortranParser.g | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/fortran/ofp/cparser/CFortranParser.g b/src/fortran/ofp/cparser/CFortranParser.g index e7241bb..8210609 100644 --- a/src/fortran/ofp/cparser/CFortranParser.g +++ b/src/fortran/ofp/cparser/CFortranParser.g @@ -5380,7 +5380,7 @@ main_program { c_action_main_program(hasProgramStmt, hasExecutionPart, hasInternalSubprogramPart); } - : ( program_stmt {hasProgramStmt = ANTLR3_TRUE} )? + : ( program_stmt {hasProgramStmt = ANTLR3_TRUE;} )? specification_part ( execution_part {hasExecutionPart = ANTLR3_TRUE;} )?