Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 19:35:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

I made FunctionNode to inherit from Node instead of Node.StringNode as FunctionNode is never used as a string source.

Browse Source
This commit is contained in:
igor%mir2.org 2002-11-03 01:26:29 +00:00
parent 5cb1e71d04
commit af3cca93fd
2 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
js/rhino/src/org/mozilla/javascript/FunctionNode.java
View File

@ -38,15 +38,16 @@ package org.mozilla.javascript;
import java.util.*;
public class FunctionNode extends Node.StringNode {
public class FunctionNode extends Node {
public FunctionNode(String name, Node left, Node right) {
super(TokenStream.FUNCTION, left, right, name);
super(TokenStream.FUNCTION, left, right);
functionName = name;
itsVariableTable = new VariableTable();
}
public String getFunctionName() {
return str;
return functionName;
}
public VariableTable getVariableTable() {
@ -100,4 +101,5 @@ public class FunctionNode extends Node.StringNode {
protected boolean itsNeedsActivation;
protected boolean itsCheckThis;
protected int itsFunctionType;
private String functionName;
}

20
js/rhino/src/org/mozilla/javascript/Node.java
View File

@ -56,18 +56,13 @@ public class Node implements Cloneable {
double number;
}
static class StringNode extends Node {
private static class StringNode extends Node {
StringNode(int type, String str) {
super(type);
this.str = str;
}
StringNode(int nodeType, Node left, Node right, String str) {
super(nodeType, left, right);
this.str = str;
}
String str;
}
@ -442,7 +437,7 @@ public class Node implements Cloneable {
return ((NumberNode)this).number;
}
/** Can only be called when <tt>this instanceof StringNode</tt> */
/** Can only be called when node has String context. */
public String getString() {
return ((StringNode)this).str;
}
@ -465,9 +460,8 @@ public class Node implements Cloneable {
if (Context.printTrees) {
StringBuffer sb = new StringBuffer(TokenStream.tokenToName(type));
if (this instanceof StringNode) {
sb.append(' ');
sb.append(getString());
sb.append(' ');
sb.append(getString());
} else {
switch (type) {
case TokenStream.TARGET:
@ -499,10 +493,10 @@ public class Node implements Cloneable {
sb.append(propToString(key));
sb.append(": ");
switch (key) {
case FIXUPS_PROP : // can't add this as it recurses
case FIXUPS_PROP : // can't add this as it recurses
sb.append("fixups property");
break;
case SOURCE_PROP : // can't add this as it has unprintables
case SOURCE_PROP : // can't add this as it has unprintables
sb.append("source property");
break;
case TARGETBLOCK_PROP : // can't add this as it recurses
@ -515,7 +509,7 @@ public class Node implements Cloneable {
Object obj = props.getObject(key);
if (obj != null) {
sb.append(obj.toString());
}else {
} else {
sb.append(props.getExistingInt(key));
}
break;