scratchfoundation/paper.js
1
0
Fork 0
mirror of https://github.com/scratchfoundation/paper.js.git synced 2025-01-03 19:45:44 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use the same filtering for UpdateExpression and AssignmentExpression.

Browse source
This commit is contained in:
Jürg Lehni 2014-01-05 20:23:11 +01:00
parent cd7604952c
commit dd37704f2c
1 changed files with 20 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
src/core/PaperScript.js
View file

@ -168,8 +168,7 @@ var PaperScript = Base.exports.PaperScript = (function() {
}
}
switch (node && node.type) {
case 'UnaryExpression':
// -a
case 'UnaryExpression': // -a
if (node.operator in unaryOperators
&& node.argument.type !== 'Literal') {
var arg = getCode(node.argument);
@ -177,8 +176,7 @@ var PaperScript = Base.exports.PaperScript = (function() {
+ arg + ')');
}
break;
case 'BinaryExpression':
// a + b, a - b, a / b, a * b, a == b, a % b, ...
case 'BinaryExpression': // a + b, a - b, a / b, a * b, a == b, ...
if (node.operator in binaryOperators
&& node.left.type !== 'Literal') {
var left = getCode(node.left),
@ -187,9 +185,9 @@ var PaperScript = Base.exports.PaperScript = (function() {
+ '", ' + right + ')');
}
break;
case 'UpdateExpression':
// a++, a--
if (!node.prefix && !(parent && (
case 'UpdateExpression': // a++, a--
case 'AssignmentExpression': /// a += b, a -= b
if (!(parent && (
// Filter out for statements to allow loop increments
// to perform well
parent.type === 'ForStatement'
@ -203,20 +201,21 @@ var PaperScript = Base.exports.PaperScript = (function() {
// We can't replace that with array[_$_(i, "+", 1)].
|| parent.type === 'MemberExpression'
&& parent.computed))) {
var arg = getCode(node.argument);
replaceCode(node, arg + ' = _$_(' + arg + ', "'
+ node.operator[0] + '", 1)');
}
break;
case 'AssignmentExpression':
/// a += b, a -= b
if (/^.=$/.test(node.operator)
&& node.left.type !== 'Literal'
&& !(parent && parent.type === 'ForStatement')) {
var left = getCode(node.left),
right = getCode(node.right);
replaceCode(node, left + ' = _$_(' + left + ', "'
+ node.operator[0] + '", ' + right + ')');
if (node.type === 'UpdateExpression') {
if (!node.prefix) {
var arg = getCode(node.argument);
replaceCode(node, arg + ' = _$_(' + arg + ', "'
+ node.operator[0] + '", 1)');
}
} else {
if (/^.=$/.test(node.operator)
&& node.left.type !== 'Literal') {
var left = getCode(node.left),
right = getCode(node.right);
replaceCode(node, left + ' = _$_(' + left + ', "'
+ node.operator[0] + '", ' + right + ')');
}
}
}
break;
}