c2go: support local type

cl/multifiles.go

@@ -157,6 +157,10 @@ func (p *blockCtx) checkExists(name string) (exist bool) {
 	return
 }
 
+func (p *blockCtx) inSrcFile() bool {
+	return p.hasMulti && !p.inHeader
+}
+
 func canonical(baseDir string, uri string) string {
 	if filepath.IsAbs(uri) {
 		return uri

cl/type_and_var.go

@@ -215,10 +215,21 @@ func compileStructOrUnion(ctx *blockCtx, name string, decl *ast.Node) (*types.Na
 	if debugCompileDecl {
 		log.Println(decl.TagUsed, name, "-", decl.Loc.PresumedLine)
 	}
-	t, decled := ctx.typdecls[name]
-	if !decled {
-		t = ctx.cb.NewType(name, ctx.goNodePos(decl))
-		ctx.typdecls[name] = t
+	var t *gox.TypeDecl
+	pos := ctx.goNodePos(decl)
+	realName := name
+	if ctx.inSrcFile() && decl.Name != "" {
+		realName = ctx.autoStaticName(name)
+		var scope = ctx.cb.Scope()
+		t = ctx.cb.NewType(realName, pos)
+		substObj(ctx.pkg.Types, scope, name, scope, realName)
+	} else {
+		var decled bool
+		t, decled = ctx.typdecls[name]
+		if !decled {
+			t = ctx.cb.NewType(realName, pos)
+			ctx.typdecls[name] = t
+		}
 	}
 	if decl.CompleteDefinition {
 		var inner types.Type

testdata/libc/src/foo.c

@@ -1,5 +1,10 @@
 #include "foo.h"
 
+struct cookie {
+    int a;
+};
+
 foo_t foo() {
-    return 100;
+    struct cookie v = {100};
+    return v.a;
 }

testdata/libc/src/foo2.c

@@ -1,5 +1,11 @@
 #include "foo.h"
 
+struct cookie {
+    double a;
+    int b;
+};
+
 static foo_t foo2() {
-    return 10;
+    struct cookie v = {0, 10};
+    return v.b;
 }