Remove unused if statement for "type" as a variable name (#407)

elliotchance · Dec 5, 2017 · af25cba · af25cba
1 parent ec7dae0
commit af25cba
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/tests/operators.c b/tests/operators.c
@@ -6,7 +6,7 @@
 
 int main()
 {
-	plan(35);
+	plan(36);
 
     int i = 10;
     signed char j = 1;
@@ -120,5 +120,9 @@ int main()
 	is_eq(s1, 2);
 	is_eq(({ int foo = s1 * 3; foo + 1; }), 7);
 
+	diag("Not allowable var name for Go")
+	int type = 42;
+	is_eq(type,42);
+
 	done_testing();
 }
diff --git a/tests/struct.c b/tests/struct.c
@@ -60,7 +60,7 @@ struct xx {
 
 int main()
 {
-    plan(15);
+    plan(16);
 
     struct programming variable;
     char *s = "Programming in Software Development.";
@@ -116,5 +116,13 @@ int main()
 	yy.y = 42;
 	is_eq(yy.y,42);
 
+	diag("Not allowable var name for Go")
+	struct type{
+		int type;
+	};
+	struct type t;
+	t.type = 42;
+	is_eq(t.type, 42);
+
     done_testing();
 }
diff --git a/transpiler/declarations.go b/transpiler/declarations.go
@@ -410,12 +410,6 @@ func transpileVarDecl(p *program.Program, n *ast.VarDecl) (decls []goast.Decl, t
 		return
 	}
 
-	// TODO: The name of a variable or field cannot be "type"
-	// https://github.com/elliotchance/c2go/issues/83
-	if name == "type" {
-		name = "type_"
-	}
-
 	defaultValue, _, newPre, newPost, err := getDefaultValueForVar(p, n)
 	if err != nil {
 		p.AddMessage(p.GenerateErrorMessage(err, n))