Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature/2.0.0 object interface need to release unused #70

Merged
merged 3 commits into from
Aug 1, 2024
Merged

Feature/2.0.0 object interface need to release unused #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8a44138
feat: 增加空判断 & 优化异常透出提示
HarlonWang Jul 30, 2024
04058b1
test: 更新单元测试
HarlonWang Aug 1, 2024
0b19450
feat: 统一命名
HarlonWang Aug 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion wrapper-android/src/androidTest/java/com/whl/quickjs/wrapper/QuickJSTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -963,7 +963,7 @@ public void testNullExceptionWithEval() {
@Test
public void testNullExceptionWithCompile() {
thrown.expect(NullPointerException.class);
thrown.expectMessage("Source code cannot be null");
thrown.expectMessage("Script cannot be null with unknown.js");

QuickJSContext context = createContext();
context.compile(null);
Expand Down
37 changes: 28 additions & 9 deletions wrapper-java/src/main/java/com/whl/quickjs/wrapper/QuickJSContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,10 @@ public Object evaluate(String script) {
}

public Object evaluate(String script, String fileName) {
if (script == null) {
throw new NullPointerException("Script cannot be null with " + fileName);
}

checkSameThread();
checkDestroyed();
return evaluate(context, script, fileName);
Expand Down Expand Up @@ -498,39 +502,54 @@ public Object parse(String json) {
return parseJSON(context, json);
}

public byte[] compile(String source) {
return compile(source, UNKNOWN_FILE);
public byte[] compile(String script) {
return compile(script, UNKNOWN_FILE);
}

public byte[] compile(String source, String fileName) {
public byte[] compile(String script, String fileName) {
if (script == null) {
throw new NullPointerException("Script cannot be null with " + fileName);
}

checkSameThread();
checkDestroyed();

return compile(context, source, fileName, false);
return compile(context, script, fileName, false);
}

public byte[] compileModule(String source) {
return compileModule(source, UNKNOWN_FILE);
public byte[] compileModule(String script) {
return compileModule(script, UNKNOWN_FILE);
}

public byte[] compileModule(String source, String fileName) {
public byte[] compileModule(String script, String fileName) {
if (script == null) {
throw new NullPointerException("Script cannot be null with " + fileName);
}

checkSameThread();
checkDestroyed();

return compile(context, source, fileName, true);
return compile(context, script, fileName, true);
}

public Object execute(byte[] code) {
if (code == null) {
throw new NullPointerException("Bytecode cannot be null");
}

checkSameThread();
checkDestroyed();

return execute(context, code);
}

public Object evaluateModule(String script, String moduleName) {
if (script == null) {
throw new NullPointerException("Script cannot be null with " + moduleName);
}

checkSameThread();
checkDestroyed();

return evaluateModule(context, script, moduleName);
}

Expand Down