PandacubeFr/PandaLib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add support for true and false constants in permission expressions

Browse Source
This commit is contained in:
Marc Baloup 2021-08-15 14:58:41 +02:00
parent 2a3b32f489
commit ac2df99994
Signed by: marcbal
GPG Key ID: BBC0FE3ABC30B893
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Core/src/main/java/fr/pandacube/lib/core/permissions/PermissionExpressionParser.java
View File

@ -5,6 +5,7 @@ import java.util.function.Function;
import com.fathzer.soft.javaluator.AbstractEvaluator; import com.fathzer.soft.javaluator.AbstractEvaluator;
import com.fathzer.soft.javaluator.BracketPair; import com.fathzer.soft.javaluator.BracketPair;
import com.fathzer.soft.javaluator.Constant;
import com.fathzer.soft.javaluator.Operator; import com.fathzer.soft.javaluator.Operator;
import com.fathzer.soft.javaluator.Operator.Associativity; import com.fathzer.soft.javaluator.Operator.Associativity;
import com.fathzer.soft.javaluator.Parameters; import com.fathzer.soft.javaluator.Parameters;
@ -32,6 +33,8 @@ public class PermissionExpressionParser {
private static final Operator NOT = new Operator("!", 1, Associativity.LEFT, 3); private static final Operator NOT = new Operator("!", 1, Associativity.LEFT, 3);
private static final Operator AND = new Operator("&&", 2, Associativity.LEFT, 2); private static final Operator AND = new Operator("&&", 2, Associativity.LEFT, 2);
private static final Operator OR = new Operator("||", 2, Associativity.LEFT, 1); private static final Operator OR = new Operator("||", 2, Associativity.LEFT, 1);
private static final Constant TRUE = new Constant("true");
private static final Constant FALSE = new Constant("false");
private static final Parameters PARAMETERS; private static final Parameters PARAMETERS;
@ -41,6 +44,8 @@ public class PermissionExpressionParser {
PARAMETERS.add(NOT); PARAMETERS.add(NOT);
PARAMETERS.add(AND); PARAMETERS.add(AND);
PARAMETERS.add(OR); PARAMETERS.add(OR);
PARAMETERS.add(TRUE);
PARAMETERS.add(FALSE);
PARAMETERS.addExpressionBracket(BracketPair.PARENTHESES); PARAMETERS.addExpressionBracket(BracketPair.PARENTHESES);
} }
@ -73,6 +78,15 @@ public class PermissionExpressionParser {
return super.evaluate(operator, operands, evaluationContext); return super.evaluate(operator, operands, evaluationContext);
} }
} }
@Override
protected Boolean evaluate(Constant constant, Object evaluationContext) {
if (constant == TRUE)
return true;
if (constant == FALSE)
return false;
return super.evaluate(constant, evaluationContext);
}
} }