* Bug #13007 fixed - JIMS: the compilation errors are not returned by jcompile

Change-Id: Iff2d6194f11df29f9b5e0c591fa2f416d5a2c561

diff --git a/scilab/CHANGES_5.5.X b/scilab/CHANGES_5.5.X
index 76e56f2..dc4efab 100644 (file)
--- a/scilab/CHANGES_5.5.X
+++ b/scilab/CHANGES_5.5.X
@@ -48,12 +48,14 @@ Scilab Bug Fixes
 
 * Bug #13000 fixed - []./int8(3) and on int8(3)./[] led to an endless recursive.
 
-* Bug #13003 fixed - EOJ: add a converter to handle string to enum.
+* Bug #13003 fixed - String to enum converter added to Java external objects.
 
 * Bug #13004 fixed - Debug infos were printed on an error with eoj.
 
 * Bug #13005 fixed - jcompile did not use the classpath to compile.
 
+* Bug #13007 fixed - Compilation errors were not returned by jcompile.
+
 
 Xcos Bug Fixes
 ==============

diff --git a/scilab/modules/external_objects_java/src/cpp/ScilabJavaEnvironment.cpp b/scilab/modules/external_objects_java/src/cpp/ScilabJavaEnvironment.cpp
index 10d5db7..3a10739 100644 (file)
--- a/scilab/modules/external_objects_java/src/cpp/ScilabJavaEnvironment.cpp
+++ b/scilab/modules/external_objects_java/src/cpp/ScilabJavaEnvironment.cpp
@@ -416,14 +416,21 @@ VariableType ScilabJavaEnvironment::isunwrappable(int id)
 int ScilabJavaEnvironment::compilecode(char * className, char ** code, int size)
 {
     JavaVM *vm = getScilabJavaVM();
-    const int ret = ScilabJavaCompiler::compileCode(vm, className, code, size);
+    try
+    {
+        const int ret = ScilabJavaCompiler::compileCode(vm, className, code, size);
 
-    if (ret != 0 && ret != -1)
+        if (ret != 0 && ret != -1)
+        {
+            ScilabAutoCleaner::registerVariable(envId, ret);
+        }
+
+        return ret;
+    }
+    catch (const GiwsException::JniException & e)
     {
-        ScilabAutoCleaner::registerVariable(envId, ret);
+        throw ScilabJavaException(__LINE__, __FILE__, gettext("Cannot compile the code:\n%s"), e.getJavaDescription().c_str());
     }
-
-    return ret;
 }
 
 void ScilabJavaEnvironment::enabletrace(const char * filename)

diff --git a/scilab/modules/external_objects_java/src/cpp/ScilabJavaException.hxx b/scilab/modules/external_objects_java/src/cpp/ScilabJavaException.hxx
index 75e4489..c8ff456 100644 (file)
--- a/scilab/modules/external_objects_java/src/cpp/ScilabJavaException.hxx
+++ b/scilab/modules/external_objects_java/src/cpp/ScilabJavaException.hxx
@@ -14,7 +14,7 @@ extern "C" {
 #include <sstream>
 #include <string>
 
-#define BUFFER_SIZE 1024
+#define EOJ_EXCEPTION_BUFFER_SIZE 4096
 
 using namespace org_modules_external_objects;
 
@@ -31,11 +31,11 @@ public:
 
     ScilabJavaException(const int _line, const char * _file, const char * _message, ...) : message(""), file(_file), line(_line)
     {
-        char str[BUFFER_SIZE];
+        char str[EOJ_EXCEPTION_BUFFER_SIZE];
         va_list args;
 
         va_start(args, _message);
-        vsnprintf(str, BUFFER_SIZE, _message, args);
+        vsnprintf(str, EOJ_EXCEPTION_BUFFER_SIZE, _message, args);
         va_end(args);
 
         message = getDescription(std::string(str));
@@ -43,11 +43,11 @@ public:
 
     ScilabJavaException(const int _line, const char * _file, std::string _message, ...) : message(""), file(_file), line(_line)
     {
-        char str[BUFFER_SIZE];
+        char str[EOJ_EXCEPTION_BUFFER_SIZE];
         va_list args;
 
         va_start(args, _message);
-        vsnprintf(str, BUFFER_SIZE, _message.c_str(), args);
+        vsnprintf(str, EOJ_EXCEPTION_BUFFER_SIZE, _message.c_str(), args);
         va_end(args);
 
         message = getDescription(std::string(str));

diff --git a/scilab/modules/external_objects_java/src/java/org/scilab/modules/external_objects_java/ScilabJavaCompiler.java b/scilab/modules/external_objects_java/src/java/org/scilab/modules/external_objects_java/ScilabJavaCompiler.java
index d1d6ce6..906f06c 100644 (file)
--- a/scilab/modules/external_objects_java/src/java/org/scilab/modules/external_objects_java/ScilabJavaCompiler.java
+++ b/scilab/modules/external_objects_java/src/java/org/scilab/modules/external_objects_java/ScilabJavaCompiler.java
@@ -12,9 +12,12 @@
 
 package org.scilab.modules.external_objects_java;
 
+import java.io.BufferedWriter;
+import java.io.CharArrayWriter;
 import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
+import java.io.Reader;
 import java.io.StringWriter;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -58,6 +61,9 @@ public class ScilabJavaCompiler {
     private static JavaCompiler compiler;
     private static boolean ecjLoaded = false;
 
+    private static boolean isECJ;
+
+
     static {
         new File(System.getProperty("java.io.tmpdir") + File.separator + "JIMS").mkdir();
         new File(BINPATH).mkdir();
@@ -98,6 +104,8 @@ public class ScilabJavaCompiler {
                 ecjLoaded = true;
                 findCompiler();
             }
+
+            isECJ = compiler.getClass().getSimpleName().indexOf("Eclipse") != -1;
         }
     }
 
@@ -114,7 +122,7 @@ public class ScilabJavaCompiler {
         StandardJavaFileManager stdFileManager = compiler.getStandardFileManager(null, Locale.getDefault(), null);
         String cp = null;
 
-        if (compiler.getClass().getSimpleName().indexOf("Eclipse") != -1) {
+        if (isECJ) {
             // it seems that with the embedded ecj, the only way to set the cp is to use java.class.path...
             cp = getClasspath();
             System.setProperty("java.class.path", cp + File.pathSeparatorChar + System.getProperty("java.class.path"));
@@ -126,6 +134,8 @@ public class ScilabJavaCompiler {
 
         ClassFileManager manager = new ClassFileManager(stdFileManager);
         List<SimpleJavaFileObject> compilationUnits = new ArrayList<SimpleJavaFileObject>();
+        CharArrayWriter caw = new CharArrayWriter();
+        BufferedWriter out = new BufferedWriter(caw);
         boolean isFile = true;
         SourceString sourceString = null;
         for (String s : code) {
@@ -149,7 +159,7 @@ public class ScilabJavaCompiler {
         String[] compileOptions = new String[] {"-d", BINPATH};
         Iterable<String> options = Arrays.asList(compileOptions);
 
-        CompilationTask task = compiler.getTask(null, manager, diagnostics, options, null, compilationUnits);
+        CompilationTask task = compiler.getTask(out, manager, diagnostics, options, null, compilationUnits);
         boolean success = task.call();
 
         if (cp != null) {
@@ -157,6 +167,19 @@ public class ScilabJavaCompiler {
             System.setProperty("java.class.path", s);
         }
 
+        String error = "";
+
+        try {
+            out.flush();
+            error = caw.toString();
+        } catch (IOException e) {
+
+        } finally {
+            try {
+                out.close();
+            } catch (IOException e) { }
+        }
+
         if (success) {
             if (isFile) {
                 return -1;
@@ -164,14 +187,50 @@ public class ScilabJavaCompiler {
                 return ScilabClassLoader.loadJavaClass(manager.className, true);
             }
         } else {
-            StringBuffer buf = new StringBuffer();
-            for (Diagnostic diagnostic : diagnostics.getDiagnostics()) {
-                buf.append(diagnostic.toString());
-                buf.append("\n");
+            if (!isECJ) {
+                error = getCompilerErrors(diagnostics);
+            }
+
+            throw new ScilabJavaException(error);
+        }
+    }
+
+    /**
+     * Returns the compilation errors from the diagnostics
+     * @param diagnostics the diagnostics returned by the compiler
+     * @return a string containing the errors
+     */
+    public static String getCompilerErrors(DiagnosticCollector<JavaFileObject> diagnostics) {
+        StringBuffer buffer = new StringBuffer();
+        int cpt = 1;
+        buffer.append("----------\n");
+        for (Diagnostic <? extends JavaFileObject > d : diagnostics.getDiagnostics()) {
+            buffer.append(Integer.toString(cpt++)).append(". ").append(d.getKind()).append(" in ").append(d.getSource().toUri().getPath()).append(" (at line ").append(Long.toString(d.getLineNumber())).append(")\n");
+
+            Reader reader = null;
+            try {
+                reader = d.getSource().openReader(true);
+                reader.skip(d.getStartPosition());
+                char[] data = new char[(int) (d.getEndPosition() - d.getStartPosition() + 1)];
+                reader.read(data);
+                buffer.append("        ").append(data).append('\n');
+                Arrays.fill(data, '^');
+                buffer.append("        ").append(data).append('\n');
+            } catch (IOException e) {
+
+            } finally {
+                if (reader != null) {
+                    try {
+                        reader.close();
+                    } catch (IOException e) { }
+                }
             }
 
-            throw new ScilabJavaException(buf.toString());
+            buffer.append(d.getMessage(Locale.getDefault())).append('\n');
         }
+
+        buffer.append("----------\n");
+        return buffer.toString();
     }
 
     /**