tt/AutoJs6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

6.6.1 - Alpha2 - 同步最新的 Rhino 引擎官方上游代码并进行必要的代码适配

Browse Source
This commit is contained in:
SuperMonster003
2024-12-25 21:48:51 +08:00
parent 3bea166b5a
commit c2a990878b
36 changed files with 344 additions and 294 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/src/main/java/org/autojs/autojs/rhino/TokenStream.java
View File

@@ -7,11 +7,11 @@
package org.autojs.autojs.rhino;
import org.mozilla.javascript.Kit;
import org.mozilla.javascript.ObjToIntMap;
import org.mozilla.javascript.Token;
import java.io.IOException;
import java.io.Reader;
import java.util.HashMap;
public class TokenStream {
public static final double NaN = Double
@@ -1049,7 +1049,7 @@ public class TokenStream {
if (result != Token.EOF) {
return result;
}
this.string = (String) allStrings.intern(str);
this.string = internString(str);
return Token.NAME;
}
@@ -1275,7 +1275,7 @@ public class TokenStream {
}
String str = getStringFromBuffer();
this.string = (String) allStrings.intern(str);
this.string = internString(str);
return Token.STRING;
}
@@ -2262,7 +2262,7 @@ public class TokenStream {
private char[] stringBuffer = new char[128];
private int stringBufferTop;
private final ObjToIntMap allStrings = new ObjToIntMap(50);
private final HashMap<String, String> allStrings = new HashMap<>();
// Room to backtrace from to < on failed match of the last - in <!--
private final int[] ungetBuffer = new int[3];
@@ -2302,4 +2302,18 @@ public class TokenStream {
private final String commentPrefix = "";
private int commentCursor = -1;
// Use a HashMap to ensure that we only have one copy -- the original one
// of any particular string. Yes, the "String.intern" function also does this,
// but this is how Rhino has worked for years and it's not clear that we
// want to make the JVM-wide intern pool as big as it might happen if we
// used that.
private String internString(String s) {
String existing = allStrings.putIfAbsent(s, s);
if (existing == null) {
// First time we saw it
return s;
}
return existing;
}
}

35
app/src/main/java/org/autojs/autojs/rhino/debug/Dim.java
View File

@@ -18,7 +18,6 @@ import org.mozilla.javascript.ContextFactory;
import org.mozilla.javascript.ImporterTopLevel;
import org.mozilla.javascript.Kit;
import org.mozilla.javascript.NativeCall;
import org.mozilla.javascript.ObjArray;
import org.mozilla.javascript.ScriptRuntime;
import org.mozilla.javascript.Scriptable;
import org.mozilla.javascript.ScriptableObject;
@@ -37,9 +36,12 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.net.URL;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
@@ -343,11 +345,11 @@ public class Dim {
}
}
is = (new URL(sourceUrl)).openStream();
is = new URL(sourceUrl).openStream();
}
try {
source = Kit.readReader(new InputStreamReader(is));
source = Kit.readReader(new InputStreamReader(is, StandardCharsets.UTF_8));
} finally {
is.close();
}
@@ -489,9 +491,8 @@ public class Dim {
/**
* Returns an array of all functions in the given script.
*/
private static DebuggableScript[] getAllFunctions
(DebuggableScript function) {
ObjArray functions = new ObjArray();
private static DebuggableScript[] getAllFunctions(DebuggableScript function) {
ArrayList<DebuggableScript> functions = new ArrayList<>();
collectFunctions_r(function, functions);
DebuggableScript[] result = new DebuggableScript[functions.size()];
functions.toArray(result);
@@ -501,8 +502,7 @@ public class Dim {
/**
* Helper function for {@link #getAllFunctions(DebuggableScript)}.
*/
private static void collectFunctions_r(DebuggableScript function,
ObjArray array) {
private static void collectFunctions_r(DebuggableScript function, List<DebuggableScript> array) {
array.add(function);
for (int i = 0; i != function.getFunctionCount(); ++i) {
collectFunctions_r(function.getFunction(i), array);
@@ -1037,7 +1037,7 @@ public class Dim {
public void onEngineCreate(ScriptEngine<? extends ScriptSource> engine) {
if (type != IPROXY_LISTEN) Kit.codeBug();
if (!(engine instanceof RhinoJavaScriptEngine) ||
!callback.shouldAttachDebugger((RhinoJavaScriptEngine) engine)) {
!callback.shouldAttachDebugger((RhinoJavaScriptEngine) engine)) {
return;
}
@@ -1094,7 +1094,7 @@ public class Dim {
/**
* The stack frames.
*/
private final ObjArray frameStack = new ObjArray();
private ArrayList<StackFrame> frameStack = new ArrayList<>();
/**
* Whether the debugger should break at the next line in this context.
@@ -1143,14 +1143,14 @@ public class Dim {
* Pushes a stack frame on to the stack.
*/
private void pushFrame(StackFrame frame) {
frameStack.push(frame);
frameStack.add(frame);
}
/**
* Pops a stack frame from the stack.
*/
private void popFrame() {
frameStack.pop();
frameStack.remove(frameStack.size() - 1);
}
}
@@ -1228,7 +1228,7 @@ public class Dim {
boolean lineBreak = contextData.breakNextLine;
if (lineBreak && contextData.stopAtFrameDepth >= 0) {
lineBreak = (contextData.frameCount()
<= contextData.stopAtFrameDepth);
<= contextData.stopAtFrameDepth);
}
if (!lineBreak) {
return;
@@ -1374,6 +1374,9 @@ public class Dim {
*/
public static class SourceInfo {
/** Lock for same */
private final Object breakpointsLock = new Object();
/**
* An empty array of booleans.
*/
@@ -1533,7 +1536,7 @@ public class Dim {
*/
public boolean breakableLine(int line) {
return (line < this.breakableLines.length)
&& this.breakableLines[line];
&& this.breakableLines[line];
}
/**
@@ -1554,7 +1557,7 @@ public class Dim {
return false;
}
boolean changed;
synchronized (breakpoints) {
synchronized (breakpointsLock) {
if (breakpoints[line] != value) {
breakpoints[line] = value;
changed = true;
@@ -1569,7 +1572,7 @@ public class Dim {
* Removes all breakpoints from the script.
*/
public void removeAllBreakpoints() {
synchronized (breakpoints) {
synchronized (breakpointsLock) {
Arrays.fill(breakpoints, false);
}
}

4
app/src/main/java/org/autojs/autojs/ui/project/BuildActivity.java
View File

@@ -421,7 +421,9 @@ public class BuildActivity extends BaseActivity implements ApkBuilder.ProgressCa
// name = Pinyin4j.ofRhino(name);
name = Pinyin.INSTANCE.simpleRhino(name, false, true);
}
name = name.replaceAll("\\W+", "_");
name = name
.replaceAll("\\W+", "_")
.replaceAll("(.+)_+$", "$1");
if (name.matches("^\\d.*")) {
name = "app_" + name;
}