From dbe1763d9e4d26be3cd3ec78e09909f267198f22 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Alexis=20Laferri=C3=A8re?= <alexis.laf@xymus.net>
Date: Wed, 11 Jun 2014 12:46:47 -0400
Subject: [PATCH] Java FFI: enable inserting additionnal Java files to a
 project
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Alexis Laferrière <alexis.laf@xymus.net>
---
 src/common_ffi/common_ffi.nit       |    1 +
 src/common_ffi/extra_java_files.nit |  110 +++++++++++++++++++++++++++++++++++
 2 files changed, 111 insertions(+)
 create mode 100644 src/common_ffi/extra_java_files.nit

diff --git a/src/common_ffi/common_ffi.nit b/src/common_ffi/common_ffi.nit
index 6fcef86..c22180c 100644
--- a/src/common_ffi/common_ffi.nit
+++ b/src/common_ffi/common_ffi.nit
@@ -32,6 +32,7 @@ import c_compiler_options
 import c
 import cpp
 import java
+import extra_java_files
 
 redef class MModule
 	# Does this module uses the FFI?
diff --git a/src/common_ffi/extra_java_files.nit b/src/common_ffi/extra_java_files.nit
new file mode 100644
index 0000000..632a322
--- /dev/null
+++ b/src/common_ffi/extra_java_files.nit
@@ -0,0 +1,110 @@
+# This file is part of NIT ( http://www.nitlanguage.org ).
+#
+# Copyright 2014 Alexis Laferrière <alexis.laf@xymus.net>
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Intro the annotation `extra_java_files` to compile extra java files
+#
+# It is mainly used to declare public Java classes.
+module extra_java_files
+
+import literal
+import java
+
+redef class ToolContext
+	var extra_java_files_phase: Phase = new JavaExtraFilesPhase(self, [literal_phase])
+end
+
+redef class MModule
+	# Extra Java files to compile with the project
+	private var extra_java_files: nullable Array[JavaFile] = null
+end
+
+private class JavaExtraFilesPhase
+	super Phase
+
+	redef fun process_annotated_node(nmoduledecl, nat)
+	do
+		# Skip if we are not interested
+		var annot_name = "extra_java_files"
+		if nat.n_atid.n_id.text != annot_name then return
+
+		# Do some validity checks and print errors if the annotation is used incorrectly
+		var modelbuilder = toolcontext.modelbuilder
+
+		if not nmoduledecl isa AModuledecl then
+			modelbuilder.error(nat, "Syntax error: only the declaration of modules may use \"{annot_name}\".")
+			return
+		end
+
+		var args = nat.n_args
+		if args.is_empty then
+			modelbuilder.error(nat, "Syntax error: \"{annot_name}\" expects at least one argument.")
+			return
+		end
+
+		# retrieve module
+		var nmodule = nmoduledecl.parent.as(AModule)
+		var mmodule = nmodule.mmodule.as(not null)
+		var java_files = mmodule.extra_java_files
+		if java_files == null then
+			java_files = new Array[JavaFile]
+			mmodule.extra_java_files = java_files
+		end
+
+		var format_error = "Syntax error: \"{annot_name}\" expects its arguments to be paths to java files."
+		for arg in args do
+			if not arg isa AExprAtArg then
+				modelbuilder.error(nat, format_error)
+				return
+			end
+
+			var expr = arg.n_expr
+			if not expr isa AStringFormExpr then
+				modelbuilder.error(nat, format_error)
+				return
+			end
+
+			var path = expr.value
+			assert path != null
+
+			# Append specified path to directory of the Nit source file
+			var source_file = nat.location.file
+			if source_file != null then path = "{source_file.filename.dirname}/{path}"
+
+			if not path.file_exists then
+				modelbuilder.error(nat, "FFI with Java error: file \"{path}\" not found.")
+				continue
+			end
+
+			var file = new JavaFile(path)
+			mmodule.ffi_files.add file
+			java_files.add file
+		end
+	end
+end
+
+redef class JavaLanguage
+	redef fun compile_to_files(mmodule, compdir)
+	do
+		super
+
+		# also copy over the java files
+		var extra_java_files = mmodule.extra_java_files
+		if extra_java_files != null then for file in extra_java_files do
+			var path = file.filename
+			path.file_copy_to("{compdir}/{path.basename("")}")
+		end
+	end
+end
-- 
1.7.9.5