gox v1.12.0 (pkg.SetRedeclarable)

goplus · Sep 30, 2023 · a24eeaa · a24eeaa
1 parent f7fa334
commit a24eeaa
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 6 deletions.
diff --git a/cl/compile.go b/cl/compile.go
@@ -217,7 +217,7 @@ func NewPackage(pkgPath, pkgName string, file *ast.Node, conf *Config) (pkg Pack
 		pkg.Package = gox.NewPackage(pkgPath, pkgName, confGox)
 		interp.fset = pkg.Fset
 	}
-	pkg.SetVarRedeclarable(true)
+	pkg.SetRedeclarable(true)
 	pkg.pi, err = loadFile(pkg.Package, conf, file)
 	return
 }

diff --git a/cl/multifiles.go b/cl/multifiles.go
@@ -145,7 +145,6 @@ func (p *blockCtx) logFile(node *ast.Node) {
 			}
 		}
 	}
-	return
 }
 
 func (p *blockCtx) checkExists(name string) (exist bool) {

diff --git a/cl/stmtchk.go b/cl/stmtchk.go
@@ -42,12 +42,14 @@ func (at *blockMarkCtx) markComplicated(ctx *markCtx, ref *blockMarkCtx) {
 	}
 }
 
+/*
 func (at *blockMarkCtx) getName() string {
 	if at != nil {
 		return at.name
 	}
 	return "funcBody"
 }
+*/
 
 func (at *blockMarkCtx) depth() (n int) {
 	for at != nil {
@@ -265,7 +267,6 @@ func (p *markCtx) markSwitch(ctx *blockCtx, switchStmt *ast.Node) {
 			p.mark(ctx, caseBody)
 		}
 	}
-	return
 }
 
 func (p *markCtx) markEnd() {

diff --git a/cl/type_and_var.go b/cl/type_and_var.go
@@ -597,9 +597,11 @@ func isNumber(typ types.Type) bool {
 	return isKind(typ, types.IsInteger|types.IsFloat)
 }
 
+/*
 func isUnsigned(typ types.Type) bool {
 	return isKind(typ, types.IsUnsigned)
 }
+*/
 
 func isInteger(typ types.Type) bool {
 	return isKind(typ, types.IsInteger)

diff --git a/go.mod b/go.mod
@@ -3,7 +3,7 @@ module github.com/goplus/c2go
 go 1.16
 
 require (
-	github.com/goplus/gox v1.11.39
+	github.com/goplus/gox v1.12.0
 	github.com/goplus/mod v0.11.5
 	github.com/json-iterator/go v1.1.12
 	github.com/qiniu/x v1.13.0

diff --git a/go.sum b/go.sum
@@ -2,8 +2,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/goplus/gox v1.11.39 h1:Quk9yt8k6Zn1KhIgT3va9wVouEpLkgpOkex6GdqQJOU=
-github.com/goplus/gox v1.11.39/go.mod h1:QQfPGKVmtAzat6fDYE4V4PFo/v95zvrwB9M60tbqdMM=
+github.com/goplus/gox v1.12.0 h1:VkQrIhVaKTYARQUUN+Q0+k8DtOXQqOvC6zaZP8wyG5E=
+github.com/goplus/gox v1.12.0/go.mod h1:Ek4bXv4xzfBiFuHC6yfkzHXrhUHXfrM9QyXtMusdkGo=
 github.com/goplus/mod v0.11.5 h1:3zcWlkLq/adU+y8GynZRMjSE50DfbnILdkRnToDaq24=
 github.com/goplus/mod v0.11.5/go.mod h1:NDC5E+XOT8vcJCMjqKhLDJHTHX7lyVN4Vbfi2U7dBhs=
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
-Original file line number
+Diff line change
@@ Expand Up / @@ -145,7 +145,6 @@ func (p *blockCtx) logFile(node *ast.Node) { @@
     			}
     		}
     	}
-    	return
     }
     func (p *blockCtx) checkExists(name string) (exist bool) {
@@ Expand Down @@