Skip to content

Commit 35ed8f1

Browse files
committed
fixed TypedefFlag
1 parent 3be9b42 commit 35ed8f1

File tree

10 files changed

+15
-15
lines changed

10 files changed

+15
-15
lines changed

.haxerc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
2-
"version": "4.3.3",
2+
"version": "4.3.4",
33
"resolveLibs": "scoped"
44
}

src/checkstyle/checks/Check.hx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,13 +188,13 @@ class Check {
188188
case EEnum(d):
189189
if ((pos <= td.pos.max) && (pos >= td.pos.min)) return d.flags.contains(EExtern);
190190
case ETypedef(d):
191-
if ((pos <= td.pos.max) && (pos >= td.pos.min)) return d.flags.contains(EExtern);
191+
if ((pos <= td.pos.max) && (pos >= td.pos.min)) return d.flags.contains(TDExtern);
192192
switch (d.data) {
193193
case TAnonymous(fields):
194194
for (field in fields) {
195195
if (pos > field.pos.max) continue;
196196
if (pos < field.pos.min) continue;
197-
return d.flags.contains(EExtern);
197+
return d.flags.contains(TDExtern);
198198
}
199199
default:
200200
}

src/checkstyle/checks/naming/ConstantNameCheck.hx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class ConstantNameCheck extends NameCheckBase<ConstantNameCheckToken> {
2424
checkFields(d.data, decl.toParentType());
2525
}
2626

27-
override function checkTypedefType(decl:TypeDef, d:Definition<EnumFlag, ComplexType>, pos:Position) {}
27+
override function checkTypedefType(decl:TypeDef, d:Definition<TypedefFlag, ComplexType>, pos:Position) {}
2828

2929
function checkFields(d:Array<Field>, p:ParentType) {
3030
for (field in d) {

src/checkstyle/checks/naming/MemberNameCheck.hx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ class MemberNameCheck extends NameCheckBase<MemberNameCheckToken> {
3737
checkFields(d.data, decl.toParentType());
3838
}
3939

40-
override function checkTypedefType(decl:TypeDef, d:Definition<EnumFlag, ComplexType>, pos:Position) {
40+
override function checkTypedefType(decl:TypeDef, d:Definition<TypedefFlag, ComplexType>, pos:Position) {
4141
if (!hasToken(TYPEDEF)) return;
42-
if (ignoreExtern && d.flags.contains(EExtern)) return;
42+
if (ignoreExtern && d.flags.contains(TDExtern)) return;
4343

4444
switch (d.data) {
4545
case TAnonymous(f):

src/checkstyle/checks/naming/MethodNameCheck.hx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ class MethodNameCheck extends NameCheckBase<MethodNameCheckToken> {
2121
checkFields(d.data, decl.toParentType());
2222
}
2323

24-
override function checkTypedefType(decl:TypeDef, d:Definition<EnumFlag, ComplexType>, pos:Position) {
25-
if (ignoreExtern && d.flags.contains(EExtern)) return;
24+
override function checkTypedefType(decl:TypeDef, d:Definition<TypedefFlag, ComplexType>, pos:Position) {
25+
if (ignoreExtern && d.flags.contains(TDExtern)) return;
2626

2727
var p = decl.toParentType();
2828
switch (d.data) {

src/checkstyle/checks/naming/NameCheckBase.hx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ class NameCheckBase<T> extends Check {
6262

6363
function checkAbstractType(decl:TypeDef, d:Definition<AbstractFlag, Array<Field>>, pos:Position) {}
6464

65-
function checkTypedefType(decl:TypeDef, d:Definition<EnumFlag, ComplexType>, pos:Position) {}
65+
function checkTypedefType(decl:TypeDef, d:Definition<TypedefFlag, ComplexType>, pos:Position) {}
6666

6767
function matchTypeName(type:String, name:String, pos:Position) {
6868
if (!formatRE.match(name)) {

src/checkstyle/checks/naming/ParameterNameCheck.hx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ class ParameterNameCheck extends NameCheckBase<String> {
2525
checkFields(d.data);
2626
}
2727

28-
override function checkTypedefType(decl:TypeDef, d:Definition<EnumFlag, ComplexType>, pos:Position) {
29-
if (ignoreExtern && d.flags.contains(EExtern)) return;
28+
override function checkTypedefType(decl:TypeDef, d:Definition<TypedefFlag, ComplexType>, pos:Position) {
29+
if (ignoreExtern && d.flags.contains(TDExtern)) return;
3030
switch (d.data) {
3131
case TAnonymous(f):
3232
checkFields(f);

src/checkstyle/checks/naming/TypeNameCheck.hx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ class TypeNameCheck extends NameCheckBase<TypeNameCheckToken> {
3838
matchTypeName("abstract", d.name, pos);
3939
}
4040

41-
override function checkTypedefType(decl:TypeDef, d:Definition<EnumFlag, ComplexType>, pos:Position) {
41+
override function checkTypedefType(decl:TypeDef, d:Definition<TypedefFlag, ComplexType>, pos:Position) {
4242
if (!hasToken(TYPEDEF)) return;
43-
if (ignoreExtern && d.flags.contains(EExtern)) return;
43+
if (ignoreExtern && d.flags.contains(TDExtern)) return;
4444

4545
matchTypeName("typedef", d.name, pos);
4646
}

src/checkstyle/utils/ComplexTypeUtils.hx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ class ComplexTypeUtils {
6969

7070
public static function walkImport(sl, mode, cb:ComplexTypeCallback) {}
7171

72-
public static function walkTypedef(d:Definition<EnumFlag, ComplexType>, pos:Position, cb:ComplexTypeCallback) {
72+
public static function walkTypedef(d:Definition<TypedefFlag, ComplexType>, pos:Position, cb:ComplexTypeCallback) {
7373
walkCommonDefinition(d, pos, cb);
7474
walkComplexType(d.data, d.name, pos, cb);
7575
}

src/checkstyle/utils/ExprUtils.hx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ class ExprUtils {
6969

7070
public static function walkImport(sl, mode, cb:Expr -> Void) {}
7171

72-
public static function walkTypedef(d:Definition<EnumFlag, ComplexType>, cb:Expr -> Void) {
72+
public static function walkTypedef(d:Definition<TypedefFlag, ComplexType>, cb:Expr -> Void) {
7373
walkCommonDefinition(d, cb);
7474
walkComplexType(d.data, cb);
7575
}

0 commit comments

Comments
 (0)