compileEnumConst: check src enum to _cgoe_enum

cl/blockctx.go

@@ -199,6 +199,7 @@ type blockCtx struct {
 	tyI128   types.Type
 	tyU128   types.Type
 	unnameds map[ast.ID]unnamedType
+	srcenums map[ast.ID]string
 	gblvars  map[string]*gox.VarDefs
 	public   map[string]string
 	ignored  []string

cl/compile.go

@@ -267,6 +267,7 @@ func loadFile(p *gox.Package, conf *Config, file *ast.Node) (pi *PkgInfo, err er
 	ctx := &blockCtx{
 		pkg: p, cb: p.CB(), fset: p.Fset,
 		unnameds: make(map[ast.ID]unnamedType),
+		srcenums: make(map[ast.ID]string),
 		gblvars:  make(map[string]*gox.VarDefs),
 		ignored:  conf.Ignored,
 		public:   conf.Public,

cl/expr.go

@@ -243,6 +243,9 @@ func compileTypeCast(ctx *blockCtx, v *ast.Node, src goast.Node) {
 
 func compileDeclRefExpr(ctx *blockCtx, v *ast.Node, lhs bool) {
 	name := v.ReferencedDecl.Name
+	if n, ok := ctx.srcenums[v.ReferencedDecl.ID]; ok {
+		name = n
+	}
 	avoidKeyword(&name)
 	obj := ctx.lookupParent(name)
 	if obj == nil {

cl/multifiles.go

@@ -115,6 +115,10 @@ func (p *blockCtx) autoStaticName(name string) string {
 	return "_cgos_" + name + p.baseOF
 }
 
+func (p *blockCtx) srcEnumName(name string) string {
+	return "_cgoe_" + name + p.baseOF
+}
+
 func (p *blockCtx) logFile(node *ast.Node) {
 	if f := node.Loc.PresumedFile; f != "" {
 		if p.hasMulti {

cl/type_and_var.go

@@ -306,7 +306,12 @@ func compileEnumConst(ctx *blockCtx, cdecl *gox.ConstDefs, v *ast.Node, iotav in
 		}
 		return 1
 	}
-	cdecl.New(fn, iotav, ctx.goNodePos(v), ctypes.Int, v.Name)
+	name := v.Name
+	if ctx.inSrcFile() {
+		name = ctx.srcEnumName(v.Name)
+		ctx.srcenums[v.ID] = name
+	}
+	cdecl.New(fn, iotav, ctx.goNodePos(v), ctypes.Int, name)
 	return iotav + 1
 }
 

testdata/enum/a.c

@@ -0,0 +1,9 @@
+#include <stdio.h>
+
+enum {
+    ONE,TWO
+};
+
+void test1() {
+    printf("test1 %d\n",ONE);
+}

testdata/enum/b.c

@@ -0,0 +1,10 @@
+#include <stdio.h>
+
+enum {
+   ONE,TWO
+};
+
+void test2()
+{
+    printf("test2 %d\n",TWO);
+}

testdata/enum/c2go.cfg

@@ -0,0 +1,15 @@
+{
+    "target": {
+        "dir": "cmd/enum"
+    },
+    "source": {
+        "dirs": ["."]
+    },
+    "deps": [
+        "C",
+        "github.com/goplus/c2go/testdata/libc"
+    ],
+    "include": [
+        "../libc/src", "."
+    ]
+}

testdata/enum/main.c

@@ -0,0 +1,7 @@
+extern void test1();
+extern void test2();
+
+int main() {
+    test1();
+    test2();
+}