Skip to content

Commit f742f2c

Browse files
committed
updated haxeparser
fixed enum abstract handling
1 parent 9f85e10 commit f742f2c

File tree

6 files changed

+15
-8
lines changed

6 files changed

+15
-8
lines changed

.github/workflows/checkstyle-linux.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
runs-on: ubuntu-latest
1616
strategy:
1717
matrix:
18-
haxe-version: ['4.3.0', 'nightly']
18+
haxe-version: ['4.3.1', 'nightly']
1919
env:
2020
CC_TEST_REPORTER_ID: c4eda639526d39fbcab7ab9fc68c4046d4e597df56dbcb552b42d27b3580b758
2121
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

haxe_libraries/haxeparser.hxml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# @install: lix --silent download "gh://github.com/HaxeCheckstyle/haxeparser#7e98c9aef901b8e26541cf3f8a6e1da0385b237a" into haxeparser/4.3.0-rc.1/github/7e98c9aef901b8e26541cf3f8a6e1da0385b237a
1+
# @install: lix --silent download "gh://github.com/HaxeCheckstyle/haxeparser#5f3d79c4561eea42aae43ee1b3d58e043358c03e" into haxeparser/4.3.0-rc.1/github/5f3d79c4561eea42aae43ee1b3d58e043358c03e
22
-lib hxparse
3-
-cp ${HAXE_LIBCACHE}/haxeparser/4.3.0-rc.1/github/7e98c9aef901b8e26541cf3f8a6e1da0385b237a/src
3+
-cp ${HAXE_LIBCACHE}/haxeparser/4.3.0-rc.1/github/5f3d79c4561eea42aae43ee1b3d58e043358c03e/src
44
-D haxeparser=4.3.0-rc.1

haxe_libraries/tokentree.hxml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
# @install: lix --silent download "haxelib:/tokentree#1.2.9" into tokentree/1.2.9/haxelib
2-
-cp ${HAXE_LIBCACHE}/tokentree/1.2.9/haxelib/src
3-
-D tokentree=1.2.9
1+
# @install: lix --silent download "haxelib:/tokentree#1.2.10" into tokentree/1.2.10/haxelib
2+
-cp ${HAXE_LIBCACHE}/tokentree/1.2.10/haxelib/src
3+
-D tokentree=1.2.10

src/checkstyle/utils/ComplexTypeUtils.hx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ class ComplexTypeUtils {
5959
walkCommonDefinition(d, pos, cb);
6060
for (f in d.flags) {
6161
switch (f) {
62-
case AFromType(ct) | AToType(ct) | AIsType(ct):
62+
case AbFrom(ct) | AbTo(ct) | AbOver(ct):
6363
walkComplexType(ct, f.getName(), pos, cb);
6464
default:
6565
}

src/checkstyle/utils/ExprUtils.hx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ class ExprUtils {
5959
walkCommonDefinition(d, cb);
6060
for (f in d.flags) {
6161
switch (f) {
62-
case AFromType(ct) | AToType(ct) | AIsType(ct):
62+
case AbFrom(ct) | AbTo(ct) | AbOver(ct):
6363
walkComplexType(ct, cb);
6464
default:
6565
}

src/checkstyle/utils/FieldUtils.hx

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,13 @@ class FieldUtils {
5656
case EAbstract(a):
5757
var metaName = #if (haxeparser > "3.2.0") ":enum" #else ":kwdenum" #end;
5858
var kind = a.meta.hasMeta(metaName) ? ENUM_ABSTRACT : ABSTRACT;
59+
for (flag in a.flags) {
60+
switch (flag) {
61+
case AbEnum:
62+
kind = ENUM_ABSTRACT;
63+
default:
64+
}
65+
}
5966
return {decl: decl, kind: kind};
6067
case ETypedef(d):
6168
return {decl: decl, kind: TYPEDEF};

0 commit comments

Comments
 (0)