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.

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

CI: Run gofmt and clang-format automatically on pull requests #233

Merged
merged 3 commits into from
Nov 18, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
15 changes: 15 additions & 0 deletions .github/workflows/fmt.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
name: Format Code

on: [pull_request, workflow_dispatch]

jobs:
build:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
- run: go fmt
- name: go generate (clang-format)
run: go generate
- name: Display missing format changes
run: git diff --exit-code
2 changes: 1 addition & 1 deletion isolate_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ func TestIsolateCompileUnboundScript_InvalidOptions(t *testing.T) {

opts := v8.CompileOptions{
CachedData: &v8.CompilerCachedData{Bytes: []byte("unused")},
Mode: v8.CompileModeEager,
Mode: v8.CompileModeEager,
}
panicErr := recoverPanic(func() { iso.CompileUnboundScript("console.log(1)", "script.js", opts) })
if panicErr == nil {
Expand Down
2 changes: 1 addition & 1 deletion leak_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
package v8go_test

import (
"testing"
"os"
"testing"

"rogchap.com/v8go"
)
Expand Down
2 changes: 1 addition & 1 deletion script_compiler.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ type CompileMode C.int

var (
CompileModeDefault = CompileMode(C.ScriptCompilerNoCompileOptions)
CompileModeEager = CompileMode(C.ScriptCompilerEagerCompile)
CompileModeEager = CompileMode(C.ScriptCompilerEagerCompile)
)

type CompilerCachedData struct {
Expand Down
28 changes: 18 additions & 10 deletions v8go.cc
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,10 @@ IsolateHStatistics IsolationGetHeapStatistics(IsolatePtr iso) {
hs.number_of_detached_contexts()};
}

RtnUnboundScript IsolateCompileUnboundScript(IsolatePtr iso, const char* s, const char* o, CompileOptions opts) {
RtnUnboundScript IsolateCompileUnboundScript(IsolatePtr iso,
const char* s,
const char* o,
CompileOptions opts) {
ISOLATE_SCOPE_INTERNAL_CONTEXT(iso);
TryCatch try_catch(iso);
Local<Context> local_ctx = ctx->ptr.Get(iso);
Expand All @@ -230,20 +233,23 @@ RtnUnboundScript IsolateCompileUnboundScript(IsolatePtr iso, const char* s, cons
Local<String> ogn =
String::NewFromUtf8(iso, o, NewStringType::kNormal).ToLocalChecked();

ScriptCompiler::CompileOptions option = static_cast<ScriptCompiler::CompileOptions>(opts.compileOption);
ScriptCompiler::CompileOptions option =
static_cast<ScriptCompiler::CompileOptions>(opts.compileOption);

ScriptCompiler::CachedData* cached_data = nullptr;

if (opts.cachedData.data) {
cached_data = new ScriptCompiler::CachedData(opts.cachedData.data, opts.cachedData.length);
cached_data = new ScriptCompiler::CachedData(opts.cachedData.data,
opts.cachedData.length);
}

ScriptOrigin script_origin(ogn);

ScriptCompiler::Source source(src, script_origin, cached_data);

Local<UnboundScript> unbound_script;
if (!ScriptCompiler::CompileUnboundScript(iso, &source, option).ToLocal(&unbound_script)) {
if (!ScriptCompiler::CompileUnboundScript(iso, &source, option)
.ToLocal(&unbound_script)) {
rtn.error = ExceptionError(try_catch, iso, local_ctx);
return rtn;
};
Expand All @@ -269,8 +275,8 @@ ValuePtr IsolateThrowException(IsolatePtr iso, ValuePtr value) {
m_value* new_val = new m_value;
new_val->iso = iso;
new_val->ctx = ctx;
new_val->ptr = Persistent<Value, CopyablePersistentTraits<Value>>(
iso, throw_ret_val);
new_val->ptr =
Persistent<Value, CopyablePersistentTraits<Value>>(iso, throw_ret_val);

return tracked_value(ctx, new_val);
}
Expand Down Expand Up @@ -454,8 +460,7 @@ RtnValue ObjectTemplateNewInstance(TemplatePtr ptr, ContextPtr ctx) {
return rtn;
}

void ObjectTemplateSetInternalFieldCount(TemplatePtr ptr,
int field_count) {
void ObjectTemplateSetInternalFieldCount(TemplatePtr ptr, int field_count) {
LOCAL_TEMPLATE(ptr);

Local<ObjectTemplate> obj_tmpl = tmpl.As<ObjectTemplate>();
Expand Down Expand Up @@ -647,12 +652,15 @@ RtnValue RunScript(ContextPtr ctx, const char* source, const char* origin) {

/********** UnboundScript & ScriptCompilerCachedData **********/

ScriptCompilerCachedData* UnboundScriptCreateCodeCache(IsolatePtr iso, UnboundScriptPtr us_ptr) {
ScriptCompilerCachedData* UnboundScriptCreateCodeCache(
IsolatePtr iso,
UnboundScriptPtr us_ptr) {
ISOLATE_SCOPE(iso);

Local<UnboundScript> unbound_script = us_ptr->ptr.Get(iso);

ScriptCompiler::CachedData* cached_data = ScriptCompiler::CreateCodeCache(unbound_script);
ScriptCompiler::CachedData* cached_data =
ScriptCompiler::CreateCodeCache(unbound_script);

ScriptCompilerCachedData* cd = new ScriptCompilerCachedData;
cd->ptr = cached_data;
Expand Down
17 changes: 9 additions & 8 deletions v8go.h
Original file line number Diff line number Diff line change
Expand Up @@ -146,14 +146,15 @@ extern IsolateHStatistics IsolationGetHeapStatistics(IsolatePtr ptr);
extern ValuePtr IsolateThrowException(IsolatePtr iso, ValuePtr value);

extern RtnUnboundScript IsolateCompileUnboundScript(IsolatePtr iso_ptr,
const char* source,
const char* origin,
CompileOptions options);
extern ScriptCompilerCachedData* UnboundScriptCreateCodeCache(IsolatePtr iso_ptr,
UnboundScriptPtr us_ptr);
extern void ScriptCompilerCachedDataDelete(ScriptCompilerCachedData* cached_data);
extern RtnValue UnboundScriptRun(ContextPtr ctx_ptr,
UnboundScriptPtr us_ptr);
const char* source,
const char* origin,
CompileOptions options);
extern ScriptCompilerCachedData* UnboundScriptCreateCodeCache(
IsolatePtr iso_ptr,
UnboundScriptPtr us_ptr);
extern void ScriptCompilerCachedDataDelete(
ScriptCompilerCachedData* cached_data);
extern RtnValue UnboundScriptRun(ContextPtr ctx_ptr, UnboundScriptPtr us_ptr);

extern CPUProfiler* NewCPUProfiler(IsolatePtr iso_ptr);
extern void CPUProfilerDispose(CPUProfiler* ptr);
Expand Down