Account for sub-types in ComplexTypeTools.toComplex().

HaxeFoundation · Jul 6, 2023 · 40e6c64 · 40e6c64
1 parent a8e181c
commit 40e6c64
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/std/haxe/macro/MacroStringTools.hx b/std/haxe/macro/MacroStringTools.hx
@@ -94,6 +94,10 @@ class MacroStringTools {
 
 	static public function toComplex(path:String):ComplexType {
 		var pack = path.split(".");
-		return TPath({pack: pack, name: pack.pop(), params: []});
+		if(pack.length >= 2 && ~/^[A-Z]/.match(pack[pack.length - 2])) {
+			return TPath({pack: pack, sub: pack.pop(), name: pack.pop(), params: []});
+		} else {
+			return TPath({pack: pack, name: pack.pop(), params: []});
+		}
 	}
 }