fixed TypedefFlag

AlexHaxe · Apr 18, 2024 · 35ed8f1 · 35ed8f1
1 parent 3be9b42
commit 35ed8f1
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 15 deletions.
diff --git a/.haxerc b/.haxerc
@@ -1,4 +1,4 @@
 {
-  "version": "4.3.3",
+  "version": "4.3.4",
   "resolveLibs": "scoped"
 }
diff --git a/src/checkstyle/checks/Check.hx b/src/checkstyle/checks/Check.hx
@@ -188,13 +188,13 @@ class Check {
 				case EEnum(d):
 					if ((pos <= td.pos.max) && (pos >= td.pos.min)) return d.flags.contains(EExtern);
 				case ETypedef(d):
-					if ((pos <= td.pos.max) && (pos >= td.pos.min)) return d.flags.contains(EExtern);
+					if ((pos <= td.pos.max) && (pos >= td.pos.min)) return d.flags.contains(TDExtern);
 					switch (d.data) {
 						case TAnonymous(fields):
 							for (field in fields) {
 								if (pos > field.pos.max) continue;
 								if (pos < field.pos.min) continue;
-								return d.flags.contains(EExtern);
+								return d.flags.contains(TDExtern);
 							}
 						default:
 					}

diff --git a/src/checkstyle/checks/naming/ConstantNameCheck.hx b/src/checkstyle/checks/naming/ConstantNameCheck.hx
@@ -24,7 +24,7 @@ class ConstantNameCheck extends NameCheckBase<ConstantNameCheckToken> {
 		checkFields(d.data, decl.toParentType());
 	}
 
-	override function checkTypedefType(decl:TypeDef, d:Definition<EnumFlag, ComplexType>, pos:Position) {}
+	override function checkTypedefType(decl:TypeDef, d:Definition<TypedefFlag, ComplexType>, pos:Position) {}
 
 	function checkFields(d:Array<Field>, p:ParentType) {
 		for (field in d) {

diff --git a/src/checkstyle/checks/naming/MemberNameCheck.hx b/src/checkstyle/checks/naming/MemberNameCheck.hx
@@ -37,9 +37,9 @@ class MemberNameCheck extends NameCheckBase<MemberNameCheckToken> {
 		checkFields(d.data, decl.toParentType());
 	}
 
-	override function checkTypedefType(decl:TypeDef, d:Definition<EnumFlag, ComplexType>, pos:Position) {
+	override function checkTypedefType(decl:TypeDef, d:Definition<TypedefFlag, ComplexType>, pos:Position) {
 		if (!hasToken(TYPEDEF)) return;
-		if (ignoreExtern && d.flags.contains(EExtern)) return;
+		if (ignoreExtern && d.flags.contains(TDExtern)) return;
 
 		switch (d.data) {
 			case TAnonymous(f):

diff --git a/src/checkstyle/checks/naming/MethodNameCheck.hx b/src/checkstyle/checks/naming/MethodNameCheck.hx
@@ -21,8 +21,8 @@ class MethodNameCheck extends NameCheckBase<MethodNameCheckToken> {
 		checkFields(d.data, decl.toParentType());
 	}
 
-	override function checkTypedefType(decl:TypeDef, d:Definition<EnumFlag, ComplexType>, pos:Position) {
-		if (ignoreExtern && d.flags.contains(EExtern)) return;
+	override function checkTypedefType(decl:TypeDef, d:Definition<TypedefFlag, ComplexType>, pos:Position) {
+		if (ignoreExtern && d.flags.contains(TDExtern)) return;
 
 		var p = decl.toParentType();
 		switch (d.data) {

diff --git a/src/checkstyle/checks/naming/NameCheckBase.hx b/src/checkstyle/checks/naming/NameCheckBase.hx
@@ -62,7 +62,7 @@ class NameCheckBase<T> extends Check {
 
 	function checkAbstractType(decl:TypeDef, d:Definition<AbstractFlag, Array<Field>>, pos:Position) {}
 
-	function checkTypedefType(decl:TypeDef, d:Definition<EnumFlag, ComplexType>, pos:Position) {}
+	function checkTypedefType(decl:TypeDef, d:Definition<TypedefFlag, ComplexType>, pos:Position) {}
 
 	function matchTypeName(type:String, name:String, pos:Position) {
 		if (!formatRE.match(name)) {

diff --git a/src/checkstyle/checks/naming/ParameterNameCheck.hx b/src/checkstyle/checks/naming/ParameterNameCheck.hx
@@ -25,8 +25,8 @@ class ParameterNameCheck extends NameCheckBase<String> {
 		checkFields(d.data);
 	}
 
-	override function checkTypedefType(decl:TypeDef, d:Definition<EnumFlag, ComplexType>, pos:Position) {
-		if (ignoreExtern && d.flags.contains(EExtern)) return;
+	override function checkTypedefType(decl:TypeDef, d:Definition<TypedefFlag, ComplexType>, pos:Position) {
+		if (ignoreExtern && d.flags.contains(TDExtern)) return;
 		switch (d.data) {
 			case TAnonymous(f):
 				checkFields(f);

diff --git a/src/checkstyle/checks/naming/TypeNameCheck.hx b/src/checkstyle/checks/naming/TypeNameCheck.hx
@@ -38,9 +38,9 @@ class TypeNameCheck extends NameCheckBase<TypeNameCheckToken> {
 		matchTypeName("abstract", d.name, pos);
 	}
 
-	override function checkTypedefType(decl:TypeDef, d:Definition<EnumFlag, ComplexType>, pos:Position) {
+	override function checkTypedefType(decl:TypeDef, d:Definition<TypedefFlag, ComplexType>, pos:Position) {
 		if (!hasToken(TYPEDEF)) return;
-		if (ignoreExtern && d.flags.contains(EExtern)) return;
+		if (ignoreExtern && d.flags.contains(TDExtern)) return;
 
 		matchTypeName("typedef", d.name, pos);
 	}

diff --git a/src/checkstyle/utils/ComplexTypeUtils.hx b/src/checkstyle/utils/ComplexTypeUtils.hx
@@ -69,7 +69,7 @@ class ComplexTypeUtils {
 
 	public static function walkImport(sl, mode, cb:ComplexTypeCallback) {}
 
-	public static function walkTypedef(d:Definition<EnumFlag, ComplexType>, pos:Position, cb:ComplexTypeCallback) {
+	public static function walkTypedef(d:Definition<TypedefFlag, ComplexType>, pos:Position, cb:ComplexTypeCallback) {
 		walkCommonDefinition(d, pos, cb);
 		walkComplexType(d.data, d.name, pos, cb);
 	}

diff --git a/src/checkstyle/utils/ExprUtils.hx b/src/checkstyle/utils/ExprUtils.hx
@@ -69,7 +69,7 @@ class ExprUtils {
 
 	public static function walkImport(sl, mode, cb:Expr -> Void) {}
 
-	public static function walkTypedef(d:Definition<EnumFlag, ComplexType>, cb:Expr -> Void) {
+	public static function walkTypedef(d:Definition<TypedefFlag, ComplexType>, cb:Expr -> Void) {
 		walkCommonDefinition(d, cb);
 		walkComplexType(d.data, cb);
 	}