Merge branch 'feature/funcwrite'

[simantics/platform.git] / bundles / org.simantics.scl.compiler / src / org / simantics / scl / compiler / source / TextualModuleSource.java

diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/source/TextualModuleSource.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/source/TextualModuleSource.java
index 9df29e95815e7b892fdbc6ebfd91b6a5d1de2a09..9a6f4c97fb07c33689e21885a1a641d4bdcadf01 100644 (file)
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/source/TextualModuleSource.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/source/TextualModuleSource.java
@@ -11,14 +11,19 @@ import org.simantics.scl.compiler.errors.Failable;
 import org.simantics.scl.compiler.errors.Failure;
 import org.simantics.scl.compiler.errors.Success;
 import org.simantics.scl.compiler.internal.codegen.types.JavaReferenceValidator;
+import org.simantics.scl.compiler.internal.codegen.types.JavaReferenceValidatorFactory;
 import org.simantics.scl.compiler.internal.codegen.types.RuntimeJavaReferenceValidator;
 import org.simantics.scl.compiler.module.ImportDeclaration;
 import org.simantics.scl.compiler.module.Module;
 import org.simantics.scl.compiler.module.options.ModuleCompilationOptions;
 import org.simantics.scl.compiler.module.repository.ModuleRepository;
 import org.simantics.scl.compiler.module.repository.UpdateListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public abstract class TextualModuleSource implements ModuleSource {
+    private static final Logger LOGGER = LoggerFactory.getLogger(TextualModuleSource.class);
+    
     public static final ImportDeclaration[] DEFAULT_IMPORTS = new ImportDeclaration[] {
         new ImportDeclaration("Builtin", ""),
         new ImportDeclaration("Prelude", "")
@@ -76,7 +81,7 @@ public abstract class TextualModuleSource implements ModuleSource {
     @SuppressWarnings("unchecked")
     @Override
     public Failable<Module> compileModule(final ModuleRepository environment, final UpdateListener listener, ModuleCompilationOptions options) {
-        SCLCompiler compiler = new SCLCompiler(options);
+        SCLCompiler compiler = new SCLCompiler(options, getJavaReferenceValidatorFactory());
         try {
             compiler.addSource(getSourceReader(listener));
             compiler.compile(
@@ -84,13 +89,12 @@ public abstract class TextualModuleSource implements ModuleSource {
                             environment, 
                             getBuiltinImports(listener),
                             listener),
-                    moduleName,
-                    getJavaReferenceValidator());
-            if(compiler.getErrorLog().isEmpty())
+                    moduleName);
+            if(compiler.getErrorLog().hasNoErrors())
                 return new Success<Module>(compiler.getModule());
             else {
-                System.err.println("While compiling " + getModuleName() + ":");
-                System.err.println(CompilationErrorFormatter.toString(getSourceReader(null), compiler.getErrorLog().getErrors()));
+                LOGGER.error("While compiling " + getModuleName() + ":");
+                LOGGER.error(CompilationErrorFormatter.toString(getSourceReader(null), compiler.getErrorLog().getErrors()));
                 return new Failure(compiler.getErrorLog().getErrors());
             }
         } catch (IOException e) {
@@ -98,6 +102,21 @@ public abstract class TextualModuleSource implements ModuleSource {
         }
     }
     
+    public JavaReferenceValidatorFactory getJavaReferenceValidatorFactory() {
+        return new JavaReferenceValidatorFactory() {
+            
+            @Override
+            public JavaReferenceValidator<Object, Object, Object, Object> getJavaReferenceValidator(String context) {
+                return (JavaReferenceValidator<Object, Object, Object, Object>)TextualModuleSource.this.getJavaReferenceValidator();
+            }
+            
+            @Override
+            public JavaReferenceValidator<Object, Object, Object, Object> getDefaultJavaReferenceValidator() {
+                return (JavaReferenceValidator<Object, Object, Object, Object>)TextualModuleSource.this.getJavaReferenceValidator();
+            }
+        };
+    }
+
     @Override
     public double getPriority() {
         return priority;