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

Do not apply operator overloading in situations where UpdateExpressions happen inside other contexts that would cause a change of behavior, e.g. array[i++], or if (i++ < 1).

Browse source 
Closes #260.
This commit is contained in:
Jürg Lehni 2013-08-09 10:58:04 -07:00
parent 1120b6012c
commit 720dd1b35d
1 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/core/PaperScript.js
View file

@ -161,11 +161,8 @@ paper.PaperScope.prototype.PaperScript = (function(root) {
}
// Recursively walks the AST and replaces the code of certain nodes
function walkAst(node) {
// array[i++] is a MemberExpression with computed = true.
// We cannot replace that with array[_$_(i, "+", 1)], as it would
// break the code, so let's bail out.
if (!node || node.type === 'MemberExpression' && node.computed)
function walkAst(node, parent) {
if (!node)
return;
for (var key in node) {
if (key === 'range')
@ -173,11 +170,11 @@ paper.PaperScope.prototype.PaperScript = (function(root) {
var value = node[key];
if (Array.isArray(value)) {
for (var i = 0, l = value.length; i < l; i++)
walkAst(value[i]);
walkAst(value[i], node);
} else if (value && typeof value === 'object') {
// We cannot use Base.isPlainObject() for these since
// Acorn.js uses its own internal prototypes now.
walkAst(value);
walkAst(value, node);
}
}
switch (node && node.type) {
@ -200,7 +197,17 @@ paper.PaperScope.prototype.PaperScript = (function(root) {
}
break;
case 'UpdateExpression':
if (!node.prefix) {
if (!node.prefix && !(parent && (
// We need to filter out parents that are comparison
// operators, e.g. for situations like if (++i < 1),
// as we can't replace that with if (_$_(i, "+", 1) < 1)
// Match any operator beginning with =, !, < and >.
parent.type === 'BinaryExpression'
&& /^[=!<>]/.test(parent.operator)
// array[i++] is a MemberExpression with computed = true
// 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)');