Skip to content

Commit 64847fb

Browse files
committed
wip: update code to use RealEvaluator
1 parent c54737f commit 64847fb

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

test/parser_petit_test_set.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -335,8 +335,8 @@ class PetitParserTests extends TestSet {
335335
'x * 2^2.5 * log(10,100)',
336336
];
337337

338-
ContextModel context = ContextModel()
339-
..bindVariableName('x', Number(math.pi));
338+
var context = ContextModel()..bindVariableName('x', Number(math.pi));
339+
var evaluator = RealEvaluator(context);
340340

341341
for (String expression in expressions) {
342342
/// Expression doesn't implement equal, so as an approximation
@@ -347,8 +347,8 @@ class PetitParserTests extends TestSet {
347347
try {
348348
Expression exp2 = parser.parse(exp.toString());
349349

350-
double r1 = exp.evaluate(EvaluationType.REAL, context);
351-
double r2 = exp2.evaluate(EvaluationType.REAL, context);
350+
num r1 = evaluator.evaluate(exp);
351+
num r2 = evaluator.evaluate(exp2);
352352
expect(r2, r1, reason: 'Expected $r2 for $exp ($exp2)');
353353
} on FormatException catch (fe) {
354354
expect(fe, isNot(isFormatException),

test/parser_test_set.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -286,8 +286,8 @@ class ParserTests extends TestSet {
286286
'x * 2^2.5 * log(10,100)',
287287
];
288288

289-
ContextModel context = ContextModel()
290-
..bindVariableName('x', Number(math.pi));
289+
var context = ContextModel()..bindVariableName('x', Number(math.pi));
290+
var evaluator = RealEvaluator(context);
291291

292292
for (String expression in expressions) {
293293
/// Expression doesn't implement equal, so as an approximation
@@ -298,8 +298,8 @@ class ParserTests extends TestSet {
298298
try {
299299
Expression exp2 = parser.parse(exp.toString());
300300

301-
double r1 = exp.evaluate(EvaluationType.REAL, context);
302-
double r2 = exp2.evaluate(EvaluationType.REAL, context);
301+
num r1 = evaluator.evaluate(exp);
302+
num r2 = evaluator.evaluate(exp2);
303303
expect(r2, r1, reason: 'Expected $r2 for $exp ($exp2)');
304304
} on FormatException catch (fe) {
305305
expect(fe, isNot(isFormatException),

0 commit comments

Comments
 (0)