Allow string initializer for enums (#139)

zengjie · Perryvw · commit 0887fd408ae8 · 2018-07-15T10:38:29.000+02:00
* Allow string initializer for enums

* Add more test cases for enums.

* Revert original enum test cases.
diff --git a/src/Transpiler.ts b/src/Transpiler.ts
@@ -275,7 +275,7 @@ export abstract class LuaTranspiler {
     }
 
     public transpileEnum(node: ts.EnumDeclaration): string {
-        let val = 0;
+        let val: number | string = 0;
         let result = "";
 
         const type = this.checker.getTypeAtLocation(node);
@@ -287,13 +287,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 initializers allowed for enums.", node);
+                    throw new TranspileError("Only numeric or string initializers allowed for enums.", node);
                 }
+            } else if (hasStringInitializers) {
+                throw new TranspileError("Invalid heterogeneous enum.", node);
             }
 
             if (membersOnly) {
@@ -306,7 +312,9 @@ export abstract class LuaTranspiler {
                 result += this.indent + `${defName}=${val}\n`;
             }
 
-            val++;
+            if (typeof val === "number") {
+              val++;
+            }
         });
         return result;
     }
diff --git a/test/translation/lua/enumHeterogeneous.lua b/test/translation/lua/enumHeterogeneous.lua
@@ -0,0 +1,4 @@
+TestEnum={}
+TestEnum.val1=0
+TestEnum.val2=3
+TestEnum.val3="baz"
diff --git a/test/translation/lua/enumMembersOnly.lua b/test/translation/lua/enumMembersOnly.lua
@@ -1,4 +1,5 @@
 val1=0
 val2=2
 val3=3
+val4="bye"
 local a = val1
diff --git a/test/translation/lua/enumString.lua b/test/translation/lua/enumString.lua
@@ -0,0 +1,4 @@
+TestEnum={}
+TestEnum.val1="foo"
+TestEnum.val2="bar"
+TestEnum.val3="baz"
diff --git a/test/translation/ts/enumHeterogeneous.ts b/test/translation/ts/enumHeterogeneous.ts
@@ -0,0 +1,5 @@
+enum TestEnum {
+  val1,
+  val2 = 3,
+  val3 = "baz",
+}
diff --git a/test/translation/ts/enumMembersOnly.ts b/test/translation/ts/enumMembersOnly.ts
@@ -2,7 +2,8 @@
 enum TestEnum {
     val1 = 0,
     val2 = 2,
-    val3
+    val3,
+    val4 = "bye"
 }
 
-const a = TestEnum.val1;
+const a = TestEnum.val1;
diff --git a/test/translation/ts/enumString.ts b/test/translation/ts/enumString.ts
@@ -0,0 +1,5 @@
+enum TestEnum {
+  val1 = "foo",
+  val2 = "bar",
+  val3 = "baz",
+}
diff --git a/test/unit/enum.spec.ts b/test/unit/enum.spec.ts
@@ -2,17 +2,31 @@ import { Expect, Test, TestCase } from "alsatian";
 import * as util from "../src/util"
 
 export class EnumTests {
+    @Test("Invalid heterogeneous enum")
+    public invalidHeterogeneousEnum() {
+        // Transpile & Assert
+        Expect(() => {
+            let lua = util.transpileString(
+                `enum TestEnum {
+                    a,
+                    b = "ok",
+                    c,
+                }`
+            );
+        }).toThrowError(Error, "Invalid heterogeneous enum.");
+    }
+
     @Test("Unsuported enum")
     public unsuportedEnum() {
         // Transpile & Assert
         Expect(() => {
             let lua = util.transpileString(
                 `enum TestEnum {
-                    val1 = "test",
+                    val1 = [],
                     val2 = "ok",
                     val3 = "bye"
                 }`
             );
-        }).toThrowError(Error, "Only numeric initializers allowed for enums.");
+        }).toThrowError(Error, "Only numeric or string initializers allowed for enums.");
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -275,7 +275,7 @@ export abstract class LuaTranspiler {`
`275`	`275`	`}`
`276`	`276`
`277`	`277`	`public transpileEnum(node: ts.EnumDeclaration): string {`
`278`		`- let val = 0;`
	`278`	`+ let val: number \| string = 0;`
`279`	`279`	`let result = "";`
`280`	`280`
`281`	`281`	`const type = this.checker.getTypeAtLocation(node);`
`@@ -287,13 +287,19 @@ export abstract class LuaTranspiler {`
`287`	`287`	`result += this.makeExport(name, node);`
`288`	`288`	`}`
`289`	`289`
	`290`	`+ let hasStringInitializers = false;`
`290`	`291`	`node.members.forEach(member => {`
`291`	`292`	`if (member.initializer) {`
`292`	`293`	`if (ts.isNumericLiteral(member.initializer)) {`
`293`	`294`	`val = parseInt(member.initializer.text);`
	`295`	`+ } else if (ts.isStringLiteral(member.initializer)) {`
	`296`	`+ hasStringInitializers = true;`
	`297`	+ val = `"${member.initializer.text}"`;
`294`	`298`	`} else {`
`295`		`- throw new TranspileError("Only numeric initializers allowed for enums.", node);`
	`299`	`+ throw new TranspileError("Only numeric or string initializers allowed for enums.", node);`
`296`	`300`	`}`
	`301`	`+ } else if (hasStringInitializers) {`
	`302`	`+ throw new TranspileError("Invalid heterogeneous enum.", node);`
`297`	`303`	`}`
`298`	`304`
`299`	`305`	`if (membersOnly) {`
`@@ -306,7 +312,9 @@ export abstract class LuaTranspiler {`
`306`	`312`	result += this.indent + `${defName}=${val}\n`;
`307`	`313`	`}`
`308`	`314`
`309`		`- val++;`
	`315`	`+ if (typeof val === "number") {`
	`316`	`+ val++;`
	`317`	`+ }`
`310`	`318`	`});`
`311`	`319`	`return result;`
`312`	`320`	`}`
-Original file line number
+Diff line change
@@ @@ -1,4 +1,5 @@ @@
 val1=0
 val2=2
 val3=3
 +val4="bye"
 local a = val1