From 02ecab833f68467a1ea1126b9e21e10475a43a8a Mon Sep 17 00:00:00 2001 From: Ayke van Laethem Date: Fri, 12 Apr 2019 14:11:23 +0200 Subject: [PATCH] all: check formatting on CI --- .circleci/config.yml | 1 + Makefile | 6 ++++-- loader/libclang.go | 2 +- src/reflect/type.go | 6 +++--- src/reflect/value.go | 4 ++-- src/runtime/internal/sys/zversion.go | 4 +++- 6 files changed, 14 insertions(+), 9 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7cf7d18b..6fb2329e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -95,6 +95,7 @@ commands: paths: - ~/.cache/go-build - ~/.cache/tinygo + - run: make fmt-check build-linux: steps: - checkout diff --git a/Makefile b/Makefile index 763f67c3..950bf163 100644 --- a/Makefile +++ b/Makefile @@ -92,9 +92,11 @@ endif clean: @rm -rf build +FMT_PATHS = ./*.go compiler interp ir loader src/device/arm src/examples src/machine src/os src/reflect src/runtime src/sync src/syscall fmt: - @go fmt . ./compiler ./interp ./loader ./ir ./src/device/arm ./src/examples/* ./src/machine ./src/os ./src/runtime ./src/sync ./src/syscall - @go fmt ./testdata/*.go + @gofmt -l -w $(FMT_PATHS) +fmt-check: + @unformatted=$$(gofmt -l $(FMT_PATHS)); [ -z "$$unformatted" ] && exit 0; echo "Unformatted:"; for fn in $$unformatted; do echo " $$fn"; done; exit 1 test: @go test -v . diff --git a/loader/libclang.go b/loader/libclang.go index 22297f4d..4a236ba0 100644 --- a/loader/libclang.go +++ b/loader/libclang.go @@ -35,7 +35,7 @@ func (info *fileInfo) parseFragment(fragment string, cflags []string, posFilenam index := C.clang_createIndex(0, 0) defer C.clang_disposeIndex(index) - filenameC := C.CString(posFilename+"!cgo.c") + filenameC := C.CString(posFilename + "!cgo.c") defer C.free(unsafe.Pointer(filenameC)) fragmentC := C.CString(fragment) diff --git a/src/reflect/type.go b/src/reflect/type.go index a75aabde..8d1ee977 100644 --- a/src/reflect/type.go +++ b/src/reflect/type.go @@ -134,18 +134,18 @@ func (t Type) String() string { } func (t Type) Kind() Kind { - if t % 2 == 0 { + if t%2 == 0 { // basic type return Kind((t >> 1) % 32) } else { - return Kind(t >> 1) % 8 + 19 + return Kind(t>>1)%8 + 19 } } func (t Type) Elem() Type { switch t.Kind() { case Chan, Ptr, Slice: - if (t >> 4) % 2 != 0 { + if (t>>4)%2 != 0 { panic("unimplemented: (reflect.Type).Elem() for named types") } return t >> 5 diff --git a/src/reflect/value.go b/src/reflect/value.go index ae5490f4..d3de8536 100644 --- a/src/reflect/value.go +++ b/src/reflect/value.go @@ -335,7 +335,7 @@ func (v Value) Index(i int) Value { typecode: v.Type().Elem(), indirect: true, } - addr := uintptr(slice.Data) + elem.Type().Size() * uintptr(i) // pointer to new value + addr := uintptr(slice.Data) + elem.Type().Size()*uintptr(i) // pointer to new value elem.value = unsafe.Pointer(addr) return elem case String: @@ -348,7 +348,7 @@ func (v Value) Index(i int) Value { } return Value{ typecode: Uint8.basicType(), - value: unsafe.Pointer(uintptr(*(*uint8)(unsafe.Pointer(s.Data + uintptr(i))))), + value: unsafe.Pointer(uintptr(*(*uint8)(unsafe.Pointer(s.Data + uintptr(i))))), } case Array: panic("unimplemented: (reflect.Value).Index()") diff --git a/src/runtime/internal/sys/zversion.go b/src/runtime/internal/sys/zversion.go index b0aaf2e4..cebb1219 100644 --- a/src/runtime/internal/sys/zversion.go +++ b/src/runtime/internal/sys/zversion.go @@ -1 +1,3 @@ -TheVersion = `go0.1.0` +package sys + +const TheVersion = `go0.1.0`