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

Fixes for NervousText example.

Browse Source
This commit is contained in:
norris%netscape.com 2000-03-09 21:50:14 +00:00
parent ec66213a10
commit cd8ce490e8
8 changed files with 48 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
js/rhino/org/mozilla/javascript/FunctionObject.java
View File

@ -294,7 +294,7 @@ public class FunctionObject extends NativeFunction {
* @param name the name of the methods to find
* @return an array of the found methods, or null if no methods
* by that name were found.
* @see java.lang.Class#getDeclaredMethods
* @see java.lang.Class#getMethods
*/
public static Method[] findMethods(Class clazz, String name) {
return findMethods(getMethodList(clazz), name);
@ -335,10 +335,22 @@ public class FunctionObject extends NativeFunction {
Method[] cached = methodsCache; // get once to avoid synchronization
if (cached != null && cached[0].getDeclaringClass() == clazz)
return cached;
Method[] methods = clazz.getDeclaredMethods();
boolean getMethodsCalled = false;
Method[] methods;
try {
// getDeclaredMethods may be rejected by the security manager
methods = clazz.getDeclaredMethods();
} catch (SecurityException e) {
// but getMethods is more expensive
getMethodsCalled = true;
methods = clazz.getMethods();
}
int count = 0;
for (int i=0; i < methods.length; i++) {
if (!Modifier.isPublic(methods[i].getModifiers())) {
if (getMethodsCalled
? !Modifier.isPublic(methods[i].getModifiers())
: methods[i].getDeclaringClass() != clazz)
{
methods[i] = null;
} else {
count++;

2
js/rhino/org/mozilla/javascript/optimizer/Codegen.java
View File

@ -1470,7 +1470,7 @@ public class Codegen extends Interpreter {
variableObjectLocal = reserveWordLocal(2);
thisObjLocal = reserveWordLocal(3);
if (!cx.hasCompileFunctionsWithDynamicScope()) {
if (inFunction && !cx.hasCompileFunctionsWithDynamicScope()) {
aload(funObjLocal);
classFile.add(ByteCode.INVOKEINTERFACE,
"org/mozilla/javascript/Scriptable",

5
js/rhino/org/mozilla/javascript/tools/jsc/Main.java
View File

@ -76,7 +76,8 @@ public class Main {
*
*/
public static String[] processOptions(Context cx, String args[]) {
cx.setTargetPackage(""); // default to no package
cx.setTargetPackage(""); // default to no package
cx.setGeneratingDebug(false); // default to no symbols
for (int i=0; i < args.length; i++) {
String arg = args[i];
if (!arg.startsWith("-")) {
@ -98,7 +99,7 @@ public class Main {
cx.setOptimizationLevel(optLevel);
continue;
}
if (arg.equals("-debuglevel") && ++i < args.length) {
if (false && arg.equals("-debuglevel") && ++i < args.length) {
int debugLevel = Integer.parseInt(args[i]);
cx.setDebugLevel(debugLevel);
continue;

8
js/rhino/org/mozilla/javascript/tools/resources/Messages.properties
View File

@ -90,12 +90,14 @@ msg.uncaughtJSException =\
msg.jsc.usage =\
Didn''t understand "{0}". \n\
Valid arguments are: \n\
\ -version 100|110|120|130 \n\
\ -version 100|110|120|130|140|150 \n\
\ -opt [1-9] \n\
\ -debug \n\
\ -debuglevel [0-9]\n\
\ -nosource \n\
\ -o outfile.class
\ -o outfile.class \n\
\ -package packageName \n\
\ -extends extendsClassName \n\
\ -implements implementsClassName
msg.no.file =\

18
js/rhino/src/org/mozilla/javascript/FunctionObject.java
View File

@ -294,7 +294,7 @@ public class FunctionObject extends NativeFunction {
* @param name the name of the methods to find
* @return an array of the found methods, or null if no methods
* by that name were found.
* @see java.lang.Class#getDeclaredMethods
* @see java.lang.Class#getMethods
*/
public static Method[] findMethods(Class clazz, String name) {
return findMethods(getMethodList(clazz), name);
@ -335,10 +335,22 @@ public class FunctionObject extends NativeFunction {
Method[] cached = methodsCache; // get once to avoid synchronization
if (cached != null && cached[0].getDeclaringClass() == clazz)
return cached;
Method[] methods = clazz.getDeclaredMethods();
boolean getMethodsCalled = false;
Method[] methods;
try {
// getDeclaredMethods may be rejected by the security manager
methods = clazz.getDeclaredMethods();
} catch (SecurityException e) {
// but getMethods is more expensive
getMethodsCalled = true;
methods = clazz.getMethods();
}
int count = 0;
for (int i=0; i < methods.length; i++) {
if (!Modifier.isPublic(methods[i].getModifiers())) {
if (getMethodsCalled
? !Modifier.isPublic(methods[i].getModifiers())
: methods[i].getDeclaringClass() != clazz)
{
methods[i] = null;
} else {
count++;

2
js/rhino/src/org/mozilla/javascript/optimizer/Codegen.java
View File

@ -1470,7 +1470,7 @@ public class Codegen extends Interpreter {
variableObjectLocal = reserveWordLocal(2);
thisObjLocal = reserveWordLocal(3);
if (!cx.hasCompileFunctionsWithDynamicScope()) {
if (inFunction && !cx.hasCompileFunctionsWithDynamicScope()) {
aload(funObjLocal);
classFile.add(ByteCode.INVOKEINTERFACE,
"org/mozilla/javascript/Scriptable",

5
js/rhino/toolsrc/org/mozilla/javascript/tools/jsc/Main.java
View File

@ -76,7 +76,8 @@ public class Main {
*
*/
public static String[] processOptions(Context cx, String args[]) {
cx.setTargetPackage(""); // default to no package
cx.setTargetPackage(""); // default to no package
cx.setGeneratingDebug(false); // default to no symbols
for (int i=0; i < args.length; i++) {
String arg = args[i];
if (!arg.startsWith("-")) {
@ -98,7 +99,7 @@ public class Main {
cx.setOptimizationLevel(optLevel);
continue;
}
if (arg.equals("-debuglevel") && ++i < args.length) {
if (false && arg.equals("-debuglevel") && ++i < args.length) {
int debugLevel = Integer.parseInt(args[i]);
cx.setDebugLevel(debugLevel);
continue;

8
js/rhino/toolsrc/org/mozilla/javascript/tools/resources/Messages.properties
View File

@ -90,12 +90,14 @@ msg.uncaughtJSException =\
msg.jsc.usage =\
Didn''t understand "{0}". \n\
Valid arguments are: \n\
\ -version 100|110|120|130 \n\
\ -version 100|110|120|130|140|150 \n\
\ -opt [1-9] \n\
\ -debug \n\
\ -debuglevel [0-9]\n\
\ -nosource \n\
\ -o outfile.class
\ -o outfile.class \n\
\ -package packageName \n\
\ -extends extendsClassName \n\
\ -implements implementsClassName
msg.no.file =\