diff options
author | Alexander Sulfrian <alexander@sulfrian.net> | 2010-06-08 09:01:43 +0200 |
---|---|---|
committer | Alexander Sulfrian <alexander@sulfrian.net> | 2010-06-08 09:01:43 +0200 |
commit | d1fa08fdc9cb11dccee76d668ff85df30458c295 (patch) | |
tree | 1d19df6405103577d872902486792e8c23bce711 /infrastructure/rhino1_7R1/src/org/mozilla/javascript/optimizer/OptTransformer.java | |
parent | d7c5ad7d6263fd1baf9bfdbaa4c50b70ef2fbdb2 (diff) | |
parent | 70d1f9d6fcaefe611e778b8dbf3bafea8934aa08 (diff) | |
download | etherpad-d1fa08fdc9cb11dccee76d668ff85df30458c295.tar.gz etherpad-d1fa08fdc9cb11dccee76d668ff85df30458c295.tar.xz etherpad-d1fa08fdc9cb11dccee76d668ff85df30458c295.zip |
Merge remote branch 'upstream/master'
Conflicts:
etherpad/src/etherpad/control/pro/admin/pro_admin_control.js
etherpad/src/etherpad/control/pro/pro_main_control.js
etherpad/src/etherpad/control/pro_help_control.js
etherpad/src/etherpad/globals.js
etherpad/src/etherpad/legacy_urls.js
etherpad/src/etherpad/pne/pne_utils.js
etherpad/src/etherpad/pro/pro_utils.js
etherpad/src/main.js
etherpad/src/plugins/fileUpload/templates/fileUpload.ejs
etherpad/src/plugins/testplugin/templates/page.ejs
etherpad/src/static/css/pad2_ejs.css
etherpad/src/static/css/pro-help.css
etherpad/src/static/img/jun09/pad/protop.gif
etherpad/src/static/js/store.js
etherpad/src/themes/default/templates/framed/framedheader-pro.ejs
etherpad/src/themes/default/templates/main/home.ejs
etherpad/src/themes/default/templates/pro-help/main.ejs
etherpad/src/themes/default/templates/pro-help/pro-help-template.ejs
infrastructure/com.etherpad/licensing.scala
trunk/etherpad/src/etherpad/collab/ace/contentcollector.js
trunk/etherpad/src/etherpad/collab/ace/linestylefilter.js
trunk/etherpad/src/static/css/home-opensource.css
trunk/etherpad/src/static/js/ace.js
trunk/etherpad/src/static/js/linestylefilter_client.js
trunk/etherpad/src/templates/email/eepnet_license_info.ejs
trunk/etherpad/src/templates/pad/pad_body2.ejs
trunk/etherpad/src/templates/pad/pad_content.ejs
trunk/etherpad/src/templates/pad/padfull_body.ejs
trunk/etherpad/src/templates/pro/admin/pne-license-manager.ejs
Diffstat (limited to 'infrastructure/rhino1_7R1/src/org/mozilla/javascript/optimizer/OptTransformer.java')
-rw-r--r-- | infrastructure/rhino1_7R1/src/org/mozilla/javascript/optimizer/OptTransformer.java | 133 |
1 files changed, 133 insertions, 0 deletions
diff --git a/infrastructure/rhino1_7R1/src/org/mozilla/javascript/optimizer/OptTransformer.java b/infrastructure/rhino1_7R1/src/org/mozilla/javascript/optimizer/OptTransformer.java new file mode 100644 index 0000000..7cf679f --- /dev/null +++ b/infrastructure/rhino1_7R1/src/org/mozilla/javascript/optimizer/OptTransformer.java @@ -0,0 +1,133 @@ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is Rhino code, released + * May 6, 1999. + * + * The Initial Developer of the Original Code is + * Netscape Communications Corporation. + * Portions created by the Initial Developer are Copyright (C) 1997-1999 + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * Norris Boyd + * Roger Lawrence + * + * Alternatively, the contents of this file may be used under the terms of + * the GNU General Public License Version 2 or later (the "GPL"), in which + * case the provisions of the GPL are applicable instead of those above. If + * you wish to allow use of your version of this file only under the terms of + * the GPL and not to allow others to use your version of this file under the + * MPL, indicate your decision by deleting the provisions above and replacing + * them with the notice and other provisions required by the GPL. If you do + * not delete the provisions above, a recipient may use your version of this + * file under either the MPL or the GPL. + * + * ***** END LICENSE BLOCK ***** */ + + +package org.mozilla.javascript.optimizer; + +import org.mozilla.javascript.*; +import java.util.Hashtable; + +/** + * This class performs node transforms to prepare for optimization. + * + * @see NodeTransformer + * @author Norris Boyd + */ + +class OptTransformer extends NodeTransformer { + + OptTransformer(Hashtable possibleDirectCalls, ObjArray directCallTargets) + { + this.possibleDirectCalls = possibleDirectCalls; + this.directCallTargets = directCallTargets; + } + + protected void visitNew(Node node, ScriptOrFnNode tree) { + detectDirectCall(node, tree); + super.visitNew(node, tree); + } + + protected void visitCall(Node node, ScriptOrFnNode tree) { + detectDirectCall(node, tree); + super.visitCall(node, tree); + } + + private void detectDirectCall(Node node, ScriptOrFnNode tree) + { + if (tree.getType() == Token.FUNCTION) { + Node left = node.getFirstChild(); + + // count the arguments + int argCount = 0; + Node arg = left.getNext(); + while (arg != null) { + arg = arg.getNext(); + argCount++; + } + + if (argCount == 0) { + OptFunctionNode.get(tree).itsContainsCalls0 = true; + } + + /* + * Optimize a call site by converting call("a", b, c) into : + * + * FunctionObjectFor"a" <-- instance variable init'd by constructor + * + * // this is a DIRECTCALL node + * fn = GetProp(tmp = GetBase("a"), "a"); + * if (fn == FunctionObjectFor"a") + * fn.call(tmp, b, c) + * else + * ScriptRuntime.Call(fn, tmp, b, c) + */ + if (possibleDirectCalls != null) { + String targetName = null; + if (left.getType() == Token.NAME) { + targetName = left.getString(); + } else if (left.getType() == Token.GETPROP) { + targetName = left.getFirstChild().getNext().getString(); + } else if (left.getType() == Token.GETPROPNOWARN) { + throw Kit.codeBug(); + } + if (targetName != null) { + OptFunctionNode ofn; + ofn = (OptFunctionNode)possibleDirectCalls.get(targetName); + if (ofn != null + && argCount == ofn.fnode.getParamCount() + && !ofn.fnode.requiresActivation()) + { + // Refuse to directCall any function with more + // than 32 parameters - prevent code explosion + // for wacky test cases + if (argCount <= 32) { + node.putProp(Node.DIRECTCALL_PROP, ofn); + if (!ofn.isTargetOfDirectCall()) { + int index = directCallTargets.size(); + directCallTargets.add(ofn); + ofn.setDirectTargetIndex(index); + } + } + } + } + } + } + } + + private Hashtable possibleDirectCalls; + private ObjArray directCallTargets; +} |