mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Making BaseFunction.decompile package private: any new public function will always find its users even if the usage is broken. It was public to allow calls from debugger but simple call to Context.toString() would do the same job.

This commit is contained in:
igor%mir2.org 2004-03-18 13:37:29 +00:00
Родитель 4c26393708
Коммит 9c0a6e0861
6 изменённых файлов: 10 добавлений и 357 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

8
js/rhino/src/org/mozilla/javascript/BaseFunction.java
Просмотреть файл

@ -182,7 +182,7 @@ public class BaseFunction extends IdScriptable implements Function {
case Id_toString: {
BaseFunction realf = realFunction(thisObj, f);
int indent = ScriptRuntime.toInt32(args, 0);
return realf.decompile(cx, indent, 0);
return realf.decompile(indent, 0);
}
case Id_toSource: {
@ -197,7 +197,7 @@ public class BaseFunction extends IdScriptable implements Function {
indent = 0;
}
}
return realf.decompile(cx, indent, flags);
return realf.decompile(indent, flags);
}
case Id_apply:
@ -301,13 +301,11 @@ public class BaseFunction extends IdScriptable implements Function {
* Decompile the source information associated with this js
* function/script back into a string.
*
* @param cx Current context.
*
* @param indent How much to indent the decompiled result.
*
* @param flags Flags specifying format of decompilation output.
*/
public String decompile(Context cx, int indent, int flags)
String decompile(int indent, int flags)
{
StringBuffer sb = new StringBuffer();
boolean justbody = (0 != (flags & Decompiler.ONLY_BODY_FLAG));

6
js/rhino/src/org/mozilla/javascript/Context.java
Просмотреть файл

@ -1243,7 +1243,7 @@ public class Context
int indent)
{
NativeFunction scriptImpl = (NativeFunction) script;
return scriptImpl.decompile(this, indent, 0);
return scriptImpl.decompile(indent, 0);
}
/**
@ -1262,7 +1262,7 @@ public class Context
public final String decompileFunction(Function fun, int indent)
{
if (fun instanceof BaseFunction)
return ((BaseFunction)fun).decompile(this, indent, 0);
return ((BaseFunction)fun).decompile(indent, 0);
else
return "function " + fun.getClassName() +
"() {\n\t[native code]\n}\n";
@ -1285,7 +1285,7 @@ public class Context
{
if (fun instanceof BaseFunction) {
BaseFunction bf = (BaseFunction)fun;
return bf.decompile(this, indent, Decompiler.ONLY_BODY_FLAG);
return bf.decompile(indent, Decompiler.ONLY_BODY_FLAG);
}
// ALERT: not sure what the right response here is.
return "[native code]\n";

2
js/rhino/src/org/mozilla/javascript/IdFunction.java
Просмотреть файл

@ -105,7 +105,7 @@ public class IdFunction extends BaseFunction
throw ScriptRuntime.typeError1("msg.not.ctor", functionName);
}
public String decompile(Context cx, int indent, int flags)
String decompile(int indent, int flags)
{
StringBuffer sb = new StringBuffer();
boolean justbody = (0 != (flags & Decompiler.ONLY_BODY_FLAG));

6
js/rhino/src/org/mozilla/javascript/NativeFunction.java
Просмотреть файл

@ -67,17 +67,15 @@ public class NativeFunction extends BaseFunction
}
/**
* @param cx Current context
*
* @param indent How much to indent the decompiled result
*
* @param flags Flags specifying format of decompilation output
*/
public final String decompile(Context cx, int indent, int flags)
final String decompile(int indent, int flags)
{
String encodedSource = getEncodedSource();
if (encodedSource == null) {
return super.decompile(cx, indent, flags);
return super.decompile(indent, flags);
} else {
UintMap properties = new UintMap(1);
properties.put(Decompiler.INITIAL_INDENT_PROP, indent);

2
js/rhino/src/org/mozilla/javascript/NativeJavaMethod.java
Просмотреть файл

@ -107,7 +107,7 @@ public class NativeJavaMethod extends BaseFunction
return sig.toString();
}
public String decompile(Context cx, int indent, int flags)
String decompile(int indent, int flags)
{
StringBuffer sb = new StringBuffer();
boolean justbody = (0 != (flags & Decompiler.ONLY_BODY_FLAG));

343
js/rhino/toolsrc/org/mozilla/javascript/tools/debugger/VariableModel.java
Просмотреть файл

@ -1,343 +0,0 @@
/* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
*
* The contents of this file are subject to the Netscape 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/NPL/
*
* 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 JavaScript Debugger code, released
* November 21, 2000.
*
* The Initial Developer of the Original Code is SeeBeyond Corporation.
* Portions created by SeeBeyond are
* Copyright (C) 2000 SeeBeyond Technology Corporation. All
* Rights Reserved.
*
* Contributor(s):
* Christopher Oliver
*
* Alternatively, the contents of this file may be used under the
* terms of the GNU Public License (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 NPL, indicate your decision by
* deleting the provisions above and replace 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 NPL or the GPL.
*/
package org.mozilla.javascript.tools.debugger;
import org.mozilla.javascript.*;
import javax.swing.event.TableModelEvent;
import java.util.Hashtable;
import java.util.Enumeration;
public class VariableModel extends AbstractTreeTableModel
implements TreeTableModel {
// Names of the columns.
static protected String[] cNames = { " Name", " Value"};
// Types of the columns.
static protected Class[] cTypes = {TreeTableModel.class, String.class};
public VariableModel(Scriptable scope) {
super(scope == null ? null : new VariableNode(scope, "this"));
}
//
// Some convenience methods.
//
protected Object getObject(Object node) {
VariableNode varNode = ((VariableNode)node);
if (varNode == null) return null;
return varNode.getObject();
}
protected Object[] getChildren(Object node) {
VariableNode varNode = ((VariableNode)node);
return varNode.getChildren();
}
//
// The TreeModel interface
//
public int getChildCount(Object node) {
Object[] children = getChildren(node);
return (children == null) ? 0 : children.length;
}
public Object getChild(Object node, int i) {
return getChildren(node)[i];
}
// The superclass's implementation would work, but this is more efficient.
public boolean isLeaf(Object node) {
if (node == null) return true;
VariableNode varNode = (VariableNode)node;
Object[] children = varNode.getChildren();
if (children != null && children.length > 0) {
return false;
}
return true;
}
public boolean isCellEditable(Object node, int column) {
return column == 0;
}
//
// The TreeTableNode interface.
//
public int getColumnCount() {
return cNames.length;
}
public String getColumnName(int column) {
return cNames[column];
}
public Class getColumnClass(int column) {
return cTypes[column];
}
public Object getValueAt(Object node, int column) {
Context cx = Context.enter();
try {
Object value = getObject(node);
switch (column) {
case 0: // Name
VariableNode varNode = (VariableNode)node;
String name = "";
if (varNode.name != null) {
return name + varNode.name;
}
return name + "[" + varNode.index + "]";
case 1: // Value
if (value == Undefined.instance ||
value == ScriptableObject.NOT_FOUND) {
return "undefined";
}
if (value == null) {
return "null";
}
if (value instanceof NativeCall) {
return "[object Call]";
}
String result;
try {
if (value instanceof BaseFunction) {
result = ((BaseFunction)value).decompile(cx, 0, 0);
} else {
result = Context.toString(value);
}
} catch (RuntimeException exc) {
result = exc.getMessage();
}
StringBuffer buf = new StringBuffer();
int len = result.length();
for (int i = 0; i < len; i++) {
char ch = result.charAt(i);
if (Character.isISOControl(ch)) {
ch = ' ';
}
buf.append(ch);
}
return buf.toString();
}
} catch (Exception exc) {
//exc.printStackTrace();
} finally {
cx.exit();
}
return null;
}
public void setScope(Scriptable scope) {
VariableNode rootVar = (VariableNode)root;
rootVar.scope = scope;
fireTreeNodesChanged(this,
new Object[]{root},
null, new Object[]{root});
}
}
class VariableNode {
Scriptable scope;
String name;
int index;
public VariableNode(Scriptable scope, String name) {
this.scope = scope;
this.name = name;
}
public VariableNode(Scriptable scope, int index) {
this.scope = scope;
this.name = null;
this.index = index;
}
/**
* Returns the the string to be used to display this leaf in the JTree.
*/
public String toString() {
return (name != null ? name : "[" + index + "]");
}
public Object getObject() {
try {
if (scope == null) return null;
if (name != null) {
if (name.equals("this")) {
return scope;
}
Object result = ScriptableObject.NOT_FOUND;
if (name.equals("__proto__")) {
result = scope.getPrototype();
} else if (name.equals("__parent__")) {
result = scope.getParentScope();
} else {
try {
result = ScriptableObject.getProperty(scope, name);
} catch (RuntimeException e) {
result = e.getMessage();
}
}
if (result == ScriptableObject.NOT_FOUND) {
result = Undefined.instance;
}
return result;
}
Object result = ScriptableObject.getProperty(scope, index);
if (result == ScriptableObject.NOT_FOUND) {
result = Undefined.instance;
}
return result;
} catch (Exception exc) {
return "undefined";
}
}
Object[] children;
static final Object[] empty = new Object[0];
protected Object[] getChildren() {
if (children != null) return children;
Context cx = Context.enter();
try {
Object value = getObject();
if (value == null) return children = empty;
if (value == ScriptableObject.NOT_FOUND ||
value == Undefined.instance) {
return children = empty;
}
if (value instanceof Scriptable) {
Scriptable scrip = (Scriptable)value;
Scriptable proto = scrip.getPrototype();
Scriptable parent = scrip.getParentScope();
if (scrip.has(0, scrip)) {
int len = 0;
try {
Scriptable start = scrip;
Scriptable obj = start;
Object result = Undefined.instance;
do {
if (obj.has("length", start)) {
result = obj.get("length", start);
if (result != Scriptable.NOT_FOUND)
break;
}
obj = obj.getPrototype();
} while (obj != null);
if (result instanceof Number) {
len = ((Number)result).intValue();
}
} catch (Exception exc) {
}
if (parent != null) {
len++;
}
if (proto != null) {
len++;
}
children = new VariableNode[len];
int i = 0;
int j = 0;
if (parent != null) {
children[i++] = new VariableNode(scrip, "__parent__");
j++;
}
if (proto != null) {
children[i++] = new VariableNode(scrip, "__proto__");
j++;
}
for (; i < len; i++) {
children[i] = new VariableNode(scrip, i-j);
}
} else {
int len = 0;
Hashtable t = new Hashtable();
Object[] ids;
if (scrip instanceof ScriptableObject) {
ids = ((ScriptableObject)scrip).getAllIds();
} else {
ids = scrip.getIds();
}
if (ids == null) ids = empty;
if (proto != null) t.put("__proto__", "__proto__");
if (parent != null) t.put("__parent__", "__parent__");
if (ids.length > 0) {
for (int j = 0; j < ids.length; j++) {
t.put(ids[j], ids[j]);
}
}
ids = new Object[t.size()];
Enumeration e = t.keys();
int j = 0;
while (e.hasMoreElements()) {
ids[j++] = e.nextElement().toString();
}
if (ids != null && ids.length > 0) {
java.util.Arrays.sort(ids, new java.util.Comparator() {
public int compare(Object l, Object r) {
return l.toString().compareToIgnoreCase(r.toString());
}
});
len = ids.length;
}
children = new VariableNode[len];
for (int i = 0; i < len; i++) {
Object id = ids[i];
children[i] = new
VariableNode(scrip, id.toString());
}
}
}
} catch (Exception exc) {
exc.printStackTrace();
} finally {
cx.exit();
}
return children;
}
}