From 9ed5eae6a939541b73dfcf2786cee3188ec6b125 Mon Sep 17 00:00:00 2001 From: Ayke van Laethem Date: Mon, 8 Jun 2020 16:23:01 +0200 Subject: [PATCH] cgo: use scanner.Error in libclang Previously it would return a `*scanner.Error`, which is not supported in the error printer of the main package. This can easily be fixed by making it a regular object (instead of a pointer). --- cgo/libclang.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cgo/libclang.go b/cgo/libclang.go index 3d7695b5..649494f1 100644 --- a/cgo/libclang.go +++ b/cgo/libclang.go @@ -246,9 +246,9 @@ func tinygo_clang_globals_visitor(c, parent C.GoCXCursor, client_data C.CXClient } value := source[len(name):] // Try to convert this #define into a Go constant expression. - expr, err := parseConst(pos+token.Pos(len(name)), p.fset, value) - if err != nil { - p.errors = append(p.errors, err) + expr, scannerError := parseConst(pos+token.Pos(len(name)), p.fset, value) + if scannerError != nil { + p.errors = append(p.errors, *scannerError) } if expr != nil { // Parsing was successful.