Remove apparent LOGGER.info used for transient debugging

[simantics/platform.git] / bundles / org.simantics.db.layer0 / src / org / simantics / db / layer0 / scl / AbstractExpressionCompilationRequest.java

diff --git a/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/scl/AbstractExpressionCompilationRequest.java b/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/scl/AbstractExpressionCompilationRequest.java
index 3fcdf66ab042679ff7f0fde8e0c1cf520b8d8037..16f88a340a63e7f9dfeb9c0d7ef751a7ff8e7048 100644 (file)
--- a/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/scl/AbstractExpressionCompilationRequest.java
+++ b/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/scl/AbstractExpressionCompilationRequest.java
@@ -104,7 +104,7 @@ implements Read<Function1<EvaluationContext,Object>> {
         return DEFAULT_EXPECTED_EFFECT;
     }
     
-    private ExpressionEvaluator prepareEvaluator(final ReadGraph graph, final CompilationContext context, Type expectedType) throws DatabaseException {
+    protected ExpressionEvaluator prepareEvaluator(final ReadGraph graph, final CompilationContext context, Type expectedType) throws DatabaseException {
         final Variable contextVariable = new Variable("context", getContextVariableType());
         LocalEnvironment localEnvironment = new AbstractLocalEnvironment() {
             THashMap<String,Pair<Variable,Expression>> precalculatedVariables = new THashMap<String,Pair<Variable,Expression>>(); 
@@ -147,9 +147,16 @@ implements Read<Function1<EvaluationContext,Object>> {
     protected boolean parseAsBlock() {
         return false;
     }
+
+    /*
+     * Override this to provide location information in compilation error situations. 
+     */
+    protected String getContextDescription(ReadGraph graph) throws DatabaseException {
+        return toString();
+    }
     
     @SuppressWarnings("unchecked")
-    private Function1<EvaluationContext, Object> eval(ExpressionEvaluator evaluator, ReadGraph graph) throws DatabaseException {
+    protected Function1<EvaluationContext, Object> eval(ExpressionEvaluator evaluator, ReadGraph graph) throws DatabaseException {
         Object oldGraph = SCLContext.getCurrent().put("graph", graph);
         try {
             return (Function1<EvaluationContext,Object>)evaluator.eval();
@@ -160,18 +167,19 @@ implements Read<Function1<EvaluationContext,Object>> {
             else
                 throw e;
         } catch (SCLExpressionCompilationException e) {
-            LOGGER.error("Could not compile {}", evaluator.getExpressionText(), e);
             StringBuilder b = new StringBuilder();
             b.append("Couldn't compile '");
             b.append(evaluator.getExpressionText());
+            b.append("' in ");
+            b.append(getContextDescription(graph));
             b.append("':\n");
             StringBuilder b2 = new StringBuilder();
             for(CompilationError error : e.getErrors()) {
                 b2.append(error.description);
                 b2.append('\n');
             }
-            System.err.println(b.toString() + b2.toString());
-            throw new SCLDatabaseException(b.toString()+b2.toString(), b2.toString(), e.getErrors());
+            SCLDatabaseException exception = new SCLDatabaseException(b.toString()+b2.toString(), b2.toString(), e.getErrors()); 
+            throw exception; 
         } catch(Throwable e) {
             // Should not happen!
             LOGGER.error("This error should never happen", e);