Merge pull request #8 from symmetryinvestments/generator_rewrite

small fix
symmetryinvestments · Jan 9, 2024 · 0a536f9 · 0a536f9
2 parents 68c083f + 69bf3a2
commit 0a536f9
Show file tree

Hide file tree

Showing 67 changed files with 502 additions and 500 deletions.
diff --git a/fakerjs2generator/source/generator.d b/fakerjs2generator/source/generator.d
@@ -375,14 +375,14 @@ string genMustacheAA(Out)(Mustache[string] m, ref Out o, string[] path
 	iformat(o, 1, "%sstring %s(%sEnum which) {\n", overWrite ? "override " : ""
 			, pathToFuncName(path), enumName
 			);
-	iformat(o, 2, "final switch(which) {\n", m.length);
+	iformat(o, 2, "switch(which) {\n", m.length);
 	foreach(it; m.byKeyValue()) {
 		iformat(o, 3, "case %sEnum.%s: return ", enumName, it.key);
 		buildSingleMustache(o, it.value);
 		formattedWrite(o, ";\n");
 	}
+	iformat(o, 3, "default: return \"\";\n");
 	iformat(o, 2, "}\n");
-	iformat(o, 2, "return \"\";\n");
 	iformat(o, 1, "}");
 	return ret;
 }
@@ -392,15 +392,15 @@ string genChemicalUnit(Out)(ChemicalUnit[] m, ref Out o, string[] path
 {
 	string ret = pathToFuncName(path);
 	iformat(o, 1, "%sChemicalUnit %s() {\n", overWrite ? "override " : "", ret);
-	iformat(o, 2, "final switch(uniform(0, %s, this.rnd)) {\n", m.length);
+	iformat(o, 2, "switch(uniform(0, %s, this.rnd)) {\n", m.length);
 	foreach(idx, it; m) {
 		iformat(o, 3, "case %s: return ChemicalUnit(%s, %s)", idx
 					, `q"{` ~ it.name ~ `}"`
 					, `q"{` ~ it.symbol ~ `}"`);
 		formattedWrite(o, ";\n");
 	}
+	iformat(o, 3, "default: return ChemicalUnit(\"\",\"\");\n");
 	iformat(o, 2, "}\n");
-	iformat(o, 2, "return ChemicalUnit(\"\", \"\");\n");
 	iformat(o, 1, "}");
 	return ret;
 }
@@ -410,16 +410,16 @@ string genChemicalElement(Out)(ChemicalElement[] m, ref Out o, string[] path
 {
 	string ret = pathToFuncName(path);
 	iformat(o, 1, "%sChemicalElement %s() {\n", overWrite ? "override " : "", ret);
-	iformat(o, 2, "final switch(uniform(0, %s, this.rnd)) {\n", m.length);
+	iformat(o, 2, "switch(uniform(0, %s, this.rnd)) {\n", m.length);
 	foreach(idx, it; m) {
 		iformat(o, 3, "case %s: return ChemicalElement(%s, %s, %s)", idx
 					, `q"{` ~ it.symbol ~ `}"`
 					, `q"{` ~ it.name ~ `}"`
 					, it.atomicNumber);
 		formattedWrite(o, ";\n");
 	}
+	iformat(o, 3, "default: return ChemicalElement(\"\",\"\");\n");
 	iformat(o, 2, "}\n");
-	iformat(o, 2, "return ChemicalElement(\"\", \"\", 0);\n");
 	iformat(o, 1, "}");
 	return ret;
 }
@@ -429,16 +429,16 @@ string genCurrency(Out)(Currency[] m, ref Out o, string[] path
 {
 	string ret = pathToFuncName(path);
 	iformat(o, 1, "%sCurrency %s() {\n", overWrite ? "override " : "", pathToFuncName(path));
-	iformat(o, 2, "final switch(uniform(0, %s, this.rnd)) {\n", m.length);
+	iformat(o, 2, "switch(uniform(0, %s, this.rnd)) {\n", m.length);
 	foreach(idx, it; m) {
 		iformat(o, 3, "case %s: return Currency(%s, %s, %s)", idx
 					, `q"{` ~ it.name ~ `}"`
 					, `q"{` ~ it.code ~ `}"`
 					, `q"{` ~ it.symbol ~ `}"`);
 		formattedWrite(o, ";\n");
 	}
+	iformat(o, 3, "default: return Currency(\"\",\"\",\"\");\n");
 	iformat(o, 2, "}\n");
-	iformat(o, 2, "return Currency(\"\", \"\", \"\");\n");
 	iformat(o, 1, "}");
 	return ret;
 }
@@ -448,7 +448,7 @@ string genAirplane(Out)(Airplane[] m, ref Out o, string[] path
 {
 	string ret = pathToFuncName(path);
 	iformat(o, 1, "%sAirplane %s() {\n", overWrite ? "override " : "", ret);
-	iformat(o, 2, "final switch(uniform(0, %s, this.rnd)) {\n", m.length);
+	iformat(o, 2, "switch(uniform(0, %s, this.rnd)) {\n", m.length);
 	foreach(idx, it; m) {
 		iformat(o, 3, "case %s: return Airplane(%s, %s)", idx
 				, it.name.isNull()
@@ -459,8 +459,8 @@ string genAirplane(Out)(Airplane[] m, ref Out o, string[] path
 					: "nullable(q\"{" ~ it.iataTypeCode.get() ~ "}\")");
 		formattedWrite(o, ";\n");
 	}
+	iformat(o, 3, "default: return Airplane(Nullable!(string).init, Nullable!(string).init);\n");
 	iformat(o, 2, "}\n");
-	iformat(o, 2, "return Airplane(Nullable!(string).init, Nullable!(string).init);\n");
 	iformat(o, 1, "}");
 	return ret;
 }
@@ -470,7 +470,7 @@ string genAirport(Out)(Airport[] m, ref Out o, string[] path
 {
 	string ret = pathToFuncName(path);
 	iformat(o, 1, "%sAirport %s() {\n", overWrite ? "override " : "", ret);
-	iformat(o, 2, "final switch(uniform(0, %s, this.rnd)) {\n", m.length);
+	iformat(o, 2, "switch(uniform(0, %s, this.rnd)) {\n", m.length);
 	foreach(idx, it; m) {
 		iformat(o, 3, "case %s: return Airport(%s, %s)", idx
 				, it.name.isNull()
@@ -481,8 +481,8 @@ string genAirport(Out)(Airport[] m, ref Out o, string[] path
 					: "nullable(q\"{" ~ it.iataCode.get() ~ "}\")");
 		formattedWrite(o, ";\n");
 	}
+	iformat(o, 3, "default: return Airport(Nullable!(string).init, Nullable!(string).init);\n");
 	iformat(o, 2, "}\n");
-	iformat(o, 2, "return Airport(Nullable!(string).init, Nullable!(string).init);\n");
 	iformat(o, 1, "}");
 	return ret;
 }
@@ -492,7 +492,7 @@ string genAirline(Out)(Airline[] m, ref Out o, string[] path
 {
 	string ret = pathToFuncName(path);
 	iformat(o, 1, "%sAirline %s() {\n", overWrite ? "override " : "", ret);
-	iformat(o, 2, "final switch(uniform(0, %s, this.rnd)) {\n", m.length);
+	iformat(o, 2, "switch(uniform(0, %s, this.rnd)) {\n", m.length);
 	foreach(idx, it; m) {
 		iformat(o, 3, "case %s: return Airline(%s, %s)", idx
 				, it.name.isNull()
@@ -503,8 +503,8 @@ string genAirline(Out)(Airline[] m, ref Out o, string[] path
 					: "nullable(q\"{" ~ it.iataCode.get() ~ "}\")");
 		formattedWrite(o, ";\n");
 	}
+	iformat(o, 3, "default: return Airline(Nullable!(string).init, Nullable!(string).init);\n");
 	iformat(o, 2, "}\n");
-	iformat(o, 2, "return Airline(Nullable!(string).init, Nullable!(string).init);\n");
 	iformat(o, 1, "}");
 	return ret;
 }
@@ -514,14 +514,14 @@ string genMustache(Out)(Mustache[] m, ref Out o, string[] path
 {
 	string ret = pathToFuncName(path);
 	iformat(o, 1, "%sstring %s() {\n", overWrite ? "override " : "", ret);
-	iformat(o, 2, "final switch(uniform(0, %s, this.rnd)) {\n", m.length);
+	iformat(o, 2, "switch(uniform(0, %s, this.rnd)) {\n", m.length);
 	foreach(idx, it; m) {
 		iformat(o, 3, "case %s: return ", idx);
 		buildSingleMustache(o, it);
 		formattedWrite(o, ";\n");
 	}
+	iformat(o, 3, "default: return \"\";\n");
 	iformat(o, 2, "}\n");
-	iformat(o, 2, "return \"\";\n");
 	iformat(o, 1, "}");
 	return ret;
 }
@@ -665,7 +665,7 @@ class Faker_base {
 	}
 
 	final string internetEmoji() {
-		final switch(uniform(0, 10, this.rnd)) {
+		switch(uniform(0, 10, this.rnd)) {
 			case 0: return this.internetEmojiSmiley();
 			case 1: return this.internetEmojiBody();
 			case 2: return this.internetEmojiPerson();
@@ -676,6 +676,7 @@ class Faker_base {
 			case 7: return this.internetEmojiObject();
 			case 8: return this.internetEmojiSymbol();
 			case 9: return this.internetEmojiFlag();
+			default: return "";
 		}
 	}
 

diff --git a/source/faked/faker_af_za.d b/source/faked/faker_af_za.d
@@ -53,10 +53,10 @@ class Faker_af_za : Faker_en {
 	}
 
 	override string locationCityPattern() {
-		final switch(uniform(0, 1, this.rnd)) {
+		switch(uniform(0, 1, this.rnd)) {
 			case 0: return locationCityName();
+			default: return "";
 		}
-		return "";
 	}
 
 	override string locationDefaultCountry() {
@@ -82,11 +82,11 @@ class Faker_af_za : Faker_en {
 	}
 
 	override string locationStreetPattern() {
-		final switch(uniform(0, 2, this.rnd)) {
+		switch(uniform(0, 2, this.rnd)) {
 			case 0: return personFirstName() ~ " " ~ locationStreetSuffix();
 			case 1: return personLastName() ~ " " ~ locationStreetSuffix();
+			default: return "";
 		}
-		return "";
 	}
 
 	override string personFemaleFirstName() {

diff --git a/source/faked/faker_ar.d b/source/faked/faker_ar.d
@@ -134,10 +134,10 @@ class Faker_ar : Faker_en {
 	}
 
 	override string locationCityPattern() {
-		final switch(uniform(0, 1, this.rnd)) {
+		switch(uniform(0, 1, this.rnd)) {
 			case 0: return locationCityName();
+			default: return "";
 		}
-		return "";
 	}
 
 	override string locationCountry() {
@@ -261,19 +261,19 @@ class Faker_ar : Faker_en {
 	}
 
 	override string locationStreetAddress(LocationStreetAddressEnum which) {
-		final switch(which) {
+		switch(which) {
 			case LocationStreetAddressEnum.normal: return locationBuildingNumber() ~ " " ~ locationStreet();
 			case LocationStreetAddressEnum.full: return locationBuildingNumber() ~ " " ~ locationStreet() ~ " " ~ locationSecondaryAddress();
+			default: return "";
 		}
-		return "";
 	}
 
 	override string locationStreetPattern() {
-		final switch(uniform(0, 2, this.rnd)) {
+		switch(uniform(0, 2, this.rnd)) {
 			case 0: return locationStreetPrefix() ~ " " ~ personFirstName();
 			case 1: return locationStreetPrefix() ~ " " ~ personLastName();
+			default: return "";
 		}
-		return "";
 	}
 
 	string locationStreetPrefix() {
@@ -669,10 +669,10 @@ class Faker_ar : Faker_en {
 	}
 
 	override string teamName() {
-		final switch(uniform(0, 1, this.rnd)) {
+		switch(uniform(0, 1, this.rnd)) {
 			case 0: return locationState() ~ " " ~ teamCreature();
+			default: return "";
 		}
-		return "";
 	}
 
 	override string vehicleFuel() {

diff --git a/source/faked/faker_az.d b/source/faked/faker_az.d
@@ -53,12 +53,12 @@ class Faker_az : Faker_en {
 	}
 
 	override string companyNamePattern() {
-		final switch(uniform(0, 3, this.rnd)) {
+		switch(uniform(0, 3, this.rnd)) {
 			case 0: return companyPrefix() ~ " " ~ personFemaleFirstName();
 			case 1: return companyPrefix() ~ " " ~ personMaleFirstName();
 			case 2: return companyPrefix() ~ " " ~ personMaleLastName();
+			default: return "";
 		}
-		return "";
 	}
 
 	string companyPrefix() {
@@ -139,10 +139,10 @@ class Faker_az : Faker_en {
 	}
 
 	override string locationCityPattern() {
-		final switch(uniform(0, 1, this.rnd)) {
+		switch(uniform(0, 1, this.rnd)) {
 			case 0: return locationCityName();
+			default: return "";
 		}
-		return "";
 	}
 
 	override string locationCountry() {
@@ -220,11 +220,11 @@ class Faker_az : Faker_en {
 	}
 
 	override string locationStreetAddress(LocationStreetAddressEnum which) {
-		final switch(which) {
+		switch(which) {
 			case LocationStreetAddressEnum.normal: return locationStreet() ~ ", " ~ locationBuildingNumber();
 			case LocationStreetAddressEnum.full: return locationStreet() ~ ", " ~ locationBuildingNumber() ~ " " ~ locationSecondaryAddress();
+			default: return "";
 		}
-		return "";
 	}
 
 	override string locationStreetName() {
@@ -293,11 +293,11 @@ class Faker_az : Faker_en {
 	}
 
 	override string locationStreetPattern() {
-		final switch(uniform(0, 2, this.rnd)) {
+		switch(uniform(0, 2, this.rnd)) {
 			case 0: return locationStreetSuffix() ~ " " ~ locationStreetName();
 			case 1: return locationStreetName() ~ " " ~ locationStreetSuffix();
+			default: return "";
 		}
-		return "";
 	}
 
 	override string locationStreetSuffix() {

diff --git a/source/faked/faker_base.d b/source/faked/faker_base.d
@@ -49,7 +49,7 @@ class Faker_base {
 	}
 
 	final string internetEmoji() {
-		final switch(uniform(0, 10, this.rnd)) {
+		switch(uniform(0, 10, this.rnd)) {
 			case 0: return this.internetEmojiSmiley();
 			case 1: return this.internetEmojiBody();
 			case 2: return this.internetEmojiPerson();
@@ -60,6 +60,7 @@ class Faker_base {
 			case 7: return this.internetEmojiObject();
 			case 8: return this.internetEmojiSymbol();
 			case 9: return this.internetEmojiFlag();
+			default: return "";
 		}
 	}
 

diff --git a/source/faked/faker_cs_cz.d b/source/faked/faker_cs_cz.d
@@ -22,11 +22,11 @@ class Faker_cs_cz : Faker_en {
 	}
 
 	override string companyNamePattern() {
-		final switch(uniform(0, 2, this.rnd)) {
+		switch(uniform(0, 2, this.rnd)) {
 			case 0: return personLastName() ~ " " ~ companySuffix();
 			case 1: return personMaleLastName() ~ " a " ~ personMaleLastName() ~ " " ~ companySuffix();
+			default: return "";
 		}
-		return "";
 	}
 
 	override string companySuffix() {
@@ -208,10 +208,10 @@ class Faker_cs_cz : Faker_en {
 	}
 
 	override string locationCityPattern() {
-		final switch(uniform(0, 1, this.rnd)) {
+		switch(uniform(0, 1, this.rnd)) {
 			case 0: return locationCityName();
+			default: return "";
 		}
-		return "";
 	}
 
 	override string locationCountry() {
@@ -289,11 +289,11 @@ class Faker_cs_cz : Faker_en {
 	}
 
 	override string locationStreetAddress(LocationStreetAddressEnum which) {
-		final switch(which) {
+		switch(which) {
 			case LocationStreetAddressEnum.normal: return locationStreet() ~ " " ~ locationBuildingNumber();
 			case LocationStreetAddressEnum.full: return locationStreet() ~ " " ~ locationBuildingNumber() ~ " " ~ locationSecondaryAddress();
+			default: return "";
 		}
-		return "";
 	}
 
 	override string locationStreetName() {
@@ -1756,10 +1756,10 @@ class Faker_cs_cz : Faker_en {
 	}
 
 	override string locationStreetPattern() {
-		final switch(uniform(0, 1, this.rnd)) {
+		switch(uniform(0, 1, this.rnd)) {
 			case 0: return locationStreetName();
+			default: return "";
 		}
-		return "";
 	}
 
 	override string loremWords() {