diff --git a/src/pyson.js b/src/pyson.js index 7e7783dba2..df7f0c2ce3 100644 --- a/src/pyson.js +++ b/src/pyson.js @@ -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() { diff --git a/tests/sao.js b/tests/sao.js index b7f00a0116..193d51b78e 100644 --- a/tests/sao.js +++ b/tests/sao.js @@ -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() {