code fixes

This commit is contained in:
gnembon committed 2020-09-07 15:37:22 -03:00
1 parent 6bf1d46c50
commit a7fcaaddf1
3 files changed
+60 -51

No files matched your search

@@ -3403,25 +3403,25 @@ public class CarpetExpression
Value res;
if(lv.size()==1){
if(lv.size()==1)
{
res = lv.get(0).evalValue(c);
CarpetSettings.LOG.info(res.getString());
}
else if(lv.size()==2){
String level = lv.get(0).evalValue(c).toString();
else if(lv.size()==2)
{
String level = lv.get(0).evalValue(c).getString().toLowerCase(Locale.ROOT);
res = lv.get(1).evalValue(c);
switch(level){
case "error":CarpetSettings.LOG.error(res.getString()); break;
case "warn":CarpetSettings.LOG.warn(res.getString()); break;
case "debug":CarpetSettings.LOG.debug(res.getString()); break;
case "fatal":CarpetSettings.LOG.fatal(res.getString()); break;
case "info":CarpetSettings.LOG.info(res.getString()); break;
default: throw new InternalExpressionException("Unknown error type: "+level);
case "error": CarpetSettings.LOG.error(res.getString()); break;
case "warn": CarpetSettings.LOG.warn(res.getString()); break;
case "debug": CarpetSettings.LOG.debug(res.getString()); break;
case "fatal": CarpetSettings.LOG.fatal(res.getString()); break;
case "info": CarpetSettings.LOG.info(res.getString()); break;
default: throw new InternalExpressionException("Unknown log level for 'logger': "+level);
}
}
else throw new InternalExpressionException("logger only takes 1 or 2 arguments");
else throw new InternalExpressionException("logger takes 1 or 2 arguments");
return (_c, _t) -> res; // pass through for variables
});