Skip to content

Commit

Permalink
Merge pull request #439 from AAVSO/438-generate-more-vela-error-messages
Browse files Browse the repository at this point in the history 
#438: added common binary operator error method and made liberal use …
  • Loading branch information
@dbenn
dbenn authored Jul 12, 2024
2 parents 708423d + f6759d3 commit 6292565
Show file tree
Hide file tree
Showing 2 changed files with 87 additions and 13 deletions.
86 changes: 73 additions & 13 deletions src/org/aavso/tools/vstar/vela/VeLaInterpreter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -477,12 +477,14 @@ public void eval(AST ast) throws VeLaEvalError {
negResult.add(new Operand(Type.REAL, -scalar.doubleVal()));
break;
default:
binaryOpError(op, Type.INTEGER, Type.REAL);
break;
}
}
stack.push(new Operand(Type.LIST, negResult));
break;
default:
binaryOpError(op, Type.INTEGER, Type.REAL, Type.LIST);
break;
}
break;
Expand All @@ -506,12 +508,15 @@ public void eval(AST ast) throws VeLaEvalError {
notResult.add(new Operand(Type.INTEGER, ~scalar.intVal()));
break;
default:
binaryOpError(op, Type.INTEGER, Type.BOOLEAN);
break;
}
}
stack.push(new Operand(Type.LIST, notResult));
break;
default:
binaryOpError(op, Type.INTEGER, Type.BOOLEAN, Type.LIST);
;
break;
}
}
Expand Down Expand Up @@ -736,6 +741,7 @@ private void applyBinaryOperation(Operation op) {
stack.push(new Operand(Type.STRING, operand1.stringVal() + operand2.stringVal()));
break;
default:
binaryOpError(op, Type.INTEGER, Type.REAL, Type.STRING);
break;
}
break;
Expand All @@ -748,6 +754,8 @@ private void applyBinaryOperation(Operation op) {
stack.push(new Operand(Type.REAL, operand1.doubleVal() - operand2.doubleVal()));
break;
default:
binaryOpError(op, Type.INTEGER, Type.REAL);
break;
}
break;
case MUL:
Expand All @@ -759,6 +767,8 @@ private void applyBinaryOperation(Operation op) {
stack.push(new Operand(Type.REAL, operand1.doubleVal() * operand2.doubleVal()));
break;
default:
binaryOpError(op, Type.INTEGER, Type.REAL);
break;
}
break;
case DIV:
Expand All @@ -781,6 +791,8 @@ private void applyBinaryOperation(Operation op) {
}
break;
default:
binaryOpError(op, Type.INTEGER, Type.REAL);
break;
}
break;
case POW:
Expand All @@ -803,6 +815,8 @@ private void applyBinaryOperation(Operation op) {
stack.push(new Operand(Type.REAL, Math.pow(operand1.doubleVal(), operand2.doubleVal())));
break;
default:
binaryOpError(op, Type.INTEGER, Type.REAL);
break;
}
break;
case AND:
Expand All @@ -813,6 +827,9 @@ private void applyBinaryOperation(Operation op) {
case INTEGER:
stack.push(new Operand(Type.INTEGER, operand1.intVal() & operand2.intVal()));
break;
default:
binaryOpError(op, Type.INTEGER, Type.BOOLEAN);
break;
}
break;
case XOR:
Expand All @@ -823,6 +840,9 @@ private void applyBinaryOperation(Operation op) {
case INTEGER:
stack.push(new Operand(Type.INTEGER, operand1.intVal() ^ operand2.intVal()));
break;
default:
binaryOpError(op, Type.INTEGER, Type.BOOLEAN);
break;
}
break;
case OR:
Expand All @@ -833,10 +853,16 @@ private void applyBinaryOperation(Operation op) {
case INTEGER:
stack.push(new Operand(Type.INTEGER, operand1.intVal() | operand2.intVal()));
break;
default:
binaryOpError(op, Type.INTEGER, Type.BOOLEAN);
break;
}
break;
case EQUAL:
switch (type) {
case BOOLEAN:
stack.push(new Operand(Type.BOOLEAN, operand1.booleanVal() == operand2.booleanVal()));
break;
case INTEGER:
stack.push(new Operand(Type.BOOLEAN, operand1.intVal() == operand2.intVal()));
break;
Expand All @@ -847,10 +873,15 @@ private void applyBinaryOperation(Operation op) {
stack.push(new Operand(Type.BOOLEAN, operand1.stringVal().equals(operand2.stringVal())));
break;
default:
binaryOpError(op, Type.BOOLEAN, Type.INTEGER, Type.REAL, Type.STRING);
break;
}
break;
case NOT_EQUAL:
switch (type) {
case BOOLEAN:
stack.push(new Operand(Type.BOOLEAN, operand1.booleanVal() != operand2.booleanVal()));
break;
case INTEGER:
stack.push(new Operand(Type.BOOLEAN, operand1.intVal() != operand2.intVal()));
break;
Expand All @@ -861,6 +892,8 @@ private void applyBinaryOperation(Operation op) {
stack.push(new Operand(Type.BOOLEAN, !operand1.stringVal().equals(operand2.stringVal())));
break;
default:
binaryOpError(op, Type.BOOLEAN, Type.INTEGER, Type.REAL, Type.STRING);
break;
}
break;
case GREATER_THAN:
Expand All @@ -875,6 +908,8 @@ private void applyBinaryOperation(Operation op) {
stack.push(new Operand(Type.BOOLEAN, operand1.stringVal().compareTo(operand2.stringVal()) > 0));
break;
default:
binaryOpError(op, Type.INTEGER, Type.REAL, Type.STRING);
break;
}
break;
case LESS_THAN:
Expand All @@ -889,6 +924,8 @@ private void applyBinaryOperation(Operation op) {
stack.push(new Operand(Type.BOOLEAN, operand1.stringVal().compareTo(operand2.stringVal()) < 0));
break;
default:
binaryOpError(op, Type.INTEGER, Type.REAL, Type.STRING);
break;
}
break;
case GREATER_THAN_OR_EQUAL:
Expand All @@ -903,6 +940,8 @@ private void applyBinaryOperation(Operation op) {
stack.push(new Operand(Type.BOOLEAN, operand1.stringVal().compareTo(operand2.stringVal()) >= 0));
break;
default:
binaryOpError(op, Type.INTEGER, Type.REAL, Type.STRING);
break;
}
break;
case LESS_THAN_OR_EQUAL:
Expand All @@ -917,38 +956,51 @@ private void applyBinaryOperation(Operation op) {
stack.push(new Operand(Type.BOOLEAN, operand1.stringVal().compareTo(operand2.stringVal()) <= 0));
break;
default:
binaryOpError(op, Type.INTEGER, Type.REAL, Type.STRING);
break;
}
break;
case APPROXIMATELY_EQUAL:
Pattern pattern;
String regex = operand2.stringVal();
if (!regexPatterns.containsKey(regex)) {
pattern = Pattern.compile(regex);
regexPatterns.put(regex, pattern);
if (type == Type.STRING) {
Pattern pattern;
String regex = operand2.stringVal();
if (!regexPatterns.containsKey(regex)) {
pattern = Pattern.compile(regex);
regexPatterns.put(regex, pattern);
}
pattern = regexPatterns.get(regex);
stack.push(new Operand(Type.BOOLEAN, pattern.matcher(operand1.stringVal()).matches()));
} else {
binaryOpError(op, Type.STRING);
break;
}
pattern = regexPatterns.get(regex);
stack.push(new Operand(Type.BOOLEAN, pattern.matcher(operand1.stringVal()).matches()));
break;
case IN:
if (type == Type.STRING) {
// Is one string contained within another?
stack.push(new Operand(Type.BOOLEAN, operand2.stringVal().contains(operand1.stringVal())));
} else {
binaryOpError(op, type);
binaryOpError(op, Type.STRING);
}
break;
case SHL:
switch (type) {
case INTEGER:
stack.push(new Operand(Type.INTEGER, operand1.intVal() << operand2.intVal()));
break;
default:
binaryOpError(op, Type.INTEGER);
break;
}
break;
case SHR:
switch (type) {
case INTEGER:
stack.push(new Operand(Type.INTEGER, operand1.intVal() >> operand2.intVal()));
break;
default:
binaryOpError(op, Type.INTEGER);
break;
}
break;
default:
Expand Down Expand Up @@ -1016,13 +1068,21 @@ private void applyBinaryListOperation(Operation op, Operand operand1, Operand op
}

/**
* Throw a VeLa evaluation error for the given operation and type.
* Throw a VeLa evaluation error for the given operation and types.
*
* @param op The operator
* @param type The expected type
* @param op The operator
* @param types The expected types
*/
private void binaryOpError(Operation op, Type type) {
String msg = String.format("%s expected values of type %s", op, type);
private void binaryOpError(Operation op, Type... types) {
String typeStr = "";
for (int i = 0; i < types.length; i++) {
typeStr += types[i].name();
if (i < types.length - 1) {
typeStr += " or ";
}
}
String msg = String.format("'%s' expects values of type %s",
op.token(), typeStr);
throw new VeLaEvalError(msg);
}

Expand Down
14 changes: 14 additions & 0 deletions test/org/aavso/tools/vstar/vela/VeLaTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -387,6 +387,20 @@ public void testFalse() {
assertFalse(vela.booleanExpression("false"));
}

public void testEqBoolVals() {
assertTrue(vela.booleanExpression("true = true"));
assertTrue(vela.booleanExpression("false = false"));
assertFalse(vela.booleanExpression("false = true"));
assertFalse(vela.booleanExpression("true = false"));
}

public void testNotEqBoolVals() {
assertFalse(vela.booleanExpression("true <> true"));
assertFalse(vela.booleanExpression("false <>false"));
assertTrue(vela.booleanExpression("false <> true"));
assertTrue(vela.booleanExpression("true <> false"));
}

// Bitwise operations

public void testIntegerBitwiseAndDecimal() {
Expand Down

0 comments on commit 6292565

Please sign in to comment.