Pass all arguments when evaluate And/Or PYSON

issue10327
review338201002
This commit is contained in:
Cédric Krier
2021-04-23 20:34:44 +02:00
parent f6e6a45138
commit 0760b01b65
2 changed files with 10 additions and 4 deletions
+4 -4
View File
@@ -267,8 +267,8 @@
};
Sao.PYSON.eval.And = function(statements) {
return Sao.PYSON.And.new_(statements);
Sao.PYSON.eval.And = function() {
return Sao.PYSON.And.new_(arguments);
};
Sao.PYSON.And = Sao.class_(Sao.PYSON.PYSON, {
init: function() {
@@ -317,8 +317,8 @@
};
Sao.PYSON.eval.Or = function(statements) {
return Sao.PYSON.Or.new_(statements);
Sao.PYSON.eval.Or = function() {
return Sao.PYSON.Or.new_(arguments);
};
Sao.PYSON.Or = Sao.class_(Sao.PYSON.And, {
pyson: function() {
+6
View File
@@ -1234,6 +1234,12 @@
QUnit.test('PYSON eval', function() {
QUnit.strictEqual(eval_pyson('True'), true, "eval_pyson('True')");
QUnit.strictEqual(eval_pyson('False'), false, "eval_pyson('False')");
QUnit.strictEqual(
eval_pyson('And(True, True).toString()'),
"And(true, true)", "eval_pyson('And(True, True)').toString()");
QUnit.strictEqual(
eval_pyson('Or(True, False).toString()'),
"Or(true, false)", "eval_pyson('Or(True, False)').toString()");
});
QUnit.test('DomainParser.group_operator', function() {