X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.scl.compiler%2Fsrc%2Forg%2Fsimantics%2Fscl%2Fcompiler%2Felaboration%2Fjava%2FLoggingModule.java;h=c0e3be53c9efc1b20c1080ae3502d4a5be0b35fa;hp=45596c5704e5aad359f197e445781cca148509b7;hb=d0eb7b399ba1510610da9a7f4d29b671950f1426;hpb=074cf59788feedea1837d60b133142dd73c43058 diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/java/LoggingModule.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/java/LoggingModule.java index 45596c570..c0e3be53c 100644 --- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/java/LoggingModule.java +++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/java/LoggingModule.java @@ -27,6 +27,8 @@ public class LoggingModule extends ConcreteModule { private static String[] LOGGING_METHODS = new String[] { "trace", "debug", "info", "warn", "error" }; + + public static final TCon Throwable = Types.con("Prelude", "Throwable"); public LoggingModule() { super("Logging"); @@ -39,29 +41,55 @@ public class LoggingModule extends ConcreteModule { // Common types Type loggingType = Types.functionE(Types.STRING, Types.PROC, Types.UNIT); + Type loggingTypeWithException = Types.functionE(new Type[] { Types.STRING, Throwable }, Types.PROC, Types.UNIT); // Add logging methods for(String methodName : LOGGING_METHODS) { - JavaMethod javaMethod = new JavaMethod(false, "org/slf4j/Logger", methodName, Types.PROC, Types.UNIT, Logger, Types.STRING); - SCLValue value = new SCLValue(Name.create(getName(), methodName)); - value.setType(loggingType); - value.setMacroRule(new MacroRule() { - @Override - public Expression apply(SimplificationContext context, Type[] typeParameters, EApply apply) { - ConcreteModule module = context.getCompilationContext().module; - String identifier; - if (module != null) - identifier = module.getName().replaceAll("/", "."); - else - identifier = CommandSession.class.getName(); - apply.set(new ELiteral(javaMethod), new Expression[] { - new EExternalConstant(LoggerFactory.getLogger(identifier), Logger), - apply.parameters[0] - }); - return apply; - } - }); - addValue(value); + { + JavaMethod javaMethod = new JavaMethod(false, "org/slf4j/Logger", methodName, Types.PROC, Types.UNIT, Logger, Types.STRING); + SCLValue value = new SCLValue(Name.create(getName(), methodName)); + value.setType(loggingType); + value.setMacroRule(new MacroRule() { + @Override + public Expression apply(SimplificationContext context, Type[] typeParameters, EApply apply) { + ConcreteModule module = context.getCompilationContext().module; + String identifier; + if (module != null) + identifier = module.getName().replaceAll("/", "."); + else + identifier = CommandSession.class.getName(); + apply.set(new ELiteral(javaMethod), new Expression[] { + new EExternalConstant(LoggerFactory.getLogger(identifier), Logger), + apply.parameters[0] + }); + return apply; + } + }); + addValue(value); + } + { + JavaMethod javaMethod = new JavaMethod(false, "org/slf4j/Logger", methodName, Types.PROC, Types.UNIT, Logger, Types.STRING, Throwable); + SCLValue value = new SCLValue(Name.create(getName(), methodName + "E")); + value.setType(loggingTypeWithException); + value.setMacroRule(new MacroRule() { + @Override + public Expression apply(SimplificationContext context, Type[] typeParameters, EApply apply) { + ConcreteModule module = context.getCompilationContext().module; + String identifier; + if (module != null) + identifier = module.getName().replaceAll("/", "."); + else + identifier = CommandSession.class.getName(); + apply.set(new ELiteral(javaMethod), new Expression[] { + new EExternalConstant(LoggerFactory.getLogger(identifier), Logger), + apply.parameters[0], + apply.parameters[1] + }); + return apply; + } + }); + addValue(value); + } } setParentClassLoader(LoggerFactory.class.getClassLoader());