TypeScriptToLua
diff --git a/‎src/Transpiler.ts‎
Lines changed: 4 additions & 0 deletions b/‎src/Transpiler.ts‎
Lines changed: 4 additions & 0 deletions
diff --git a/‎test/translation/lua/enumHeterogeneous.lua‎
Lines changed: 4 additions & 0 deletions b/‎test/translation/lua/enumHeterogeneous.lua‎
Lines changed: 4 additions & 0 deletions
diff --git a/‎test/translation/lua/enumString.lua‎
Lines changed: 4 additions & 0 deletions b/‎test/translation/lua/enumString.lua‎
Lines changed: 4 additions & 0 deletions
diff --git a/‎test/translation/ts/enumHeterogeneous.ts‎
Lines changed: 5 additions & 0 deletions b/‎test/translation/ts/enumHeterogeneous.ts‎
Lines changed: 5 additions & 0 deletions
diff --git a/‎test/translation/ts/enumString.ts‎
Lines changed: 5 additions & 0 deletions b/‎test/translation/ts/enumString.ts‎
Lines changed: 5 additions & 0 deletions
diff --git a/‎test/unit/enum.spec.ts‎
Lines changed: 6 additions & 6 deletions b/‎test/unit/enum.spec.ts‎
Lines changed: 6 additions & 6 deletions
@@ -294,15 +294,19 @@ export abstract class LuaTranspiler {
             result += this.makeExport(name, node);
         }
 
+        let hasStringInitializers = false;
         node.members.forEach(member => {
             if (member.initializer) {
                 if (ts.isNumericLiteral(member.initializer)) {
                     val = parseInt(member.initializer.text);
                 } else if (ts.isStringLiteral(member.initializer)) {
+                    hasStringInitializers = true;
                     val = `"${member.initializer.text}"`;
                 } else {
                     throw new TranspileError("Only numeric or string initializers allowed for enums.", node);
                 }
+            } else if (hasStringInitializers) {
+                throw new TranspileError("Invalid heterogeneous enum.", node);
             }
 
             if (membersOnly) {
 
@@ -0,0 +1,4 @@
+TestEnum={}
+TestEnum.val1=0
+TestEnum.val2=3
+TestEnum.val3="baz"
@@ -0,0 +1,4 @@
+TestEnum={}
+TestEnum.val1="foo"
+TestEnum.val2="bar"
+TestEnum.val3="baz"
@@ -0,0 +1,5 @@
+enum TestEnum {
+  val1,
+  val2 = 3,
+  val3 = "baz",
+}
@@ -0,0 +1,5 @@
+enum TestEnum {
+  val1 = "foo",
+  val2 = "bar",
+  val3 = "baz",
+}
@@ -2,18 +2,18 @@ import { Expect, Test, TestCase } from "alsatian";
 import * as util from "../src/util"
 
 export class EnumTests {
-    @Test("String enum")
-    public stringEnum() {
+    @Test("Invalid heterogeneous enum")
+    public invalidHeterogeneousEnum() {
         // Transpile & Assert
         Expect(() => {
             let lua = util.transpileString(
                 `enum TestEnum {
-                    val1 = "test",
-                    val2 = "ok",
-                    val3 = "bye"
+                    a,
+                    b = "ok",
+                    c,
                 }`
             );
-        }).not.toThrow();
+        }).toThrowError(Error, "Invalid heterogeneous enum.");
     }
 
     @Test("Unsuported enum")
Original file line number	Diff line number	Diff line change
`@@ -294,15 +294,19 @@ export abstract class LuaTranspiler {`
`294`	`294`	`result += this.makeExport(name, node);`
`295`	`295`	`}`
`296`	`296`
	`297`	`+ let hasStringInitializers = false;`
`297`	`298`	`node.members.forEach(member => {`
`298`	`299`	`if (member.initializer) {`
`299`	`300`	`if (ts.isNumericLiteral(member.initializer)) {`
`300`	`301`	`val = parseInt(member.initializer.text);`
`301`	`302`	`} else if (ts.isStringLiteral(member.initializer)) {`
	`303`	`+ hasStringInitializers = true;`
`302`	`304`	val = `"${member.initializer.text}"`;
`303`	`305`	`} else {`
`304`	`306`	`throw new TranspileError("Only numeric or string initializers allowed for enums.", node);`
`305`	`307`	`}`
	`308`	`+ } else if (hasStringInitializers) {`
	`309`	`+ throw new TranspileError("Invalid heterogeneous enum.", node);`
`306`	`310`	`}`
`307`	`311`
`308`	`312`	`if (membersOnly) {`