Skip to content

Commit e708e4c

Browse files
authored
Replace Dynamic with Any where possible (#328)
1 parent c62fa4d commit e708e4c

File tree

7 files changed

+14
-14
lines changed

7 files changed

+14
-14
lines changed

src/checkstyle/Checker.hx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ class Checker {
113113
t = lexer.token(haxeparser.HaxeLexer.tok);
114114
}
115115
}
116-
catch (e:Dynamic) {
116+
catch (e:Any) {
117117
#if debug
118118
Sys.println(e);
119119
Sys.println("Stacktrace: " + CallStack.toString(CallStack.exceptionStack()));
@@ -146,7 +146,7 @@ class Checker {
146146
try {
147147
return parser.parse();
148148
}
149-
catch (e:Dynamic) {
149+
catch (e:Any) {
150150
#if debug
151151
Sys.println(e);
152152
Sys.println("Stacktrace: " + CallStack.toString(CallStack.exceptionStack()));
@@ -199,7 +199,7 @@ class Checker {
199199
makeTokens();
200200
makeASTs();
201201
}
202-
catch (e:Dynamic) {
202+
catch (e:Any) {
203203
for (reporter in reporters) {
204204
reporter.addMessage(getErrorMessage(e, file.name, "Parsing"));
205205
reporter.fileFinish(file);
@@ -262,7 +262,7 @@ class Checker {
262262
if (checkForExclude(check.getModuleName())) return [];
263263
return check.run(this);
264264
}
265-
catch (e:Dynamic) {
265+
catch (e:Any) {
266266
for (reporter in reporters) reporter.addMessage(getErrorMessage(e, file.name, "Check " + check.getModuleName()));
267267
return [];
268268
}
@@ -286,7 +286,7 @@ class Checker {
286286
return false;
287287
}
288288

289-
function getErrorMessage(e:Dynamic, fileName:String, step:String):CheckMessage {
289+
function getErrorMessage(e:Any, fileName:String, step:String):CheckMessage {
290290
return {
291291
fileName:fileName,
292292
line:1,

src/checkstyle/Main.hx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ class Main {
186186
try {
187187
check.configureProperty(prop, val);
188188
}
189-
catch (e:Dynamic) {
189+
catch (e:Any) {
190190
var message = 'Failed to configure $prop setting for ${check.getModuleName()}: ';
191191
message += (Std.is(e, Error) ? (e:Error).message : Std.string(e));
192192
failWith(message);
@@ -343,7 +343,7 @@ class Main {
343343
files.push(path);
344344
}
345345
}
346-
catch (e:Dynamic) {
346+
catch (e:Any) {
347347
Sys.println("\nPath " + path + " not found.");
348348
}
349349
}
@@ -398,7 +398,7 @@ class Main {
398398

399399
new Main().run(args);
400400
}
401-
catch (e:Dynamic) {
401+
catch (e:Any) {
402402
Sys.stderr().writeString(e + "\n");
403403
Sys.stderr().writeString(CallStack.toString(CallStack.exceptionStack()) + "\n");
404404
}

src/checkstyle/checks/Check.hx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class Check {
2525
desc = haxe.rtti.Meta.getType(Type.getClass(this)).desc[0];
2626
}
2727

28-
public function configureProperty(name:String, value:Dynamic) {
28+
public function configureProperty(name:String, value:Any) {
2929
Reflect.setField(this, name, value);
3030
}
3131

src/checkstyle/checks/Directive.hx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class DirectiveTools {
1616
"any" => ANY
1717
];
1818

19-
public static function fromDynamic(value:Dynamic):Directive {
19+
public static function fromAny(value:Any):Directive {
2020
return switch (Type.typeof(value)) {
2121
case ValueType.TClass(String): getValidated(value);
2222
//support for legacy configs when such settings were boolean

src/checkstyle/checks/imports/UnusedImportCheck.hx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import haxe.io.Path;
88
class UnusedImportCheck extends Check {
99

1010
public var ignoreModules:Array<String>;
11-
public var moduleTypeMap:Dynamic;
11+
public var moduleTypeMap:Any;
1212

1313
public function new() {
1414
super(TOKEN);

src/checkstyle/checks/whitespace/SpacingCheck.hx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ class SpacingCheck extends Check {
3030
categories = [Category.STYLE, Category.CLARITY];
3131
}
3232

33-
override public function configureProperty(name:String, value:Dynamic) {
33+
override public function configureProperty(name:String, value:Any) {
3434
var currentValue = Reflect.field(this, name);
3535
switch (Type.typeof(currentValue)) {
3636
case ValueType.TEnum(Directive):
37-
Reflect.setField(this, name, DirectiveTools.fromDynamic(value));
37+
Reflect.setField(this, name, DirectiveTools.fromAny(value));
3838
case _:
3939
super.configureProperty(name, value);
4040
}

test/token/TokenTreeBuilderParsingTest.hx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class TokenTreeBuilderParsingTest extends haxe.unit.TestCase {
2727
try {
2828
builder = TestTokenTreeBuilder.parseCode(code);
2929
}
30-
catch (e:Dynamic) {
30+
catch (e:Any) {
3131
assertTrue(false, pos);
3232
}
3333
assertTrue(builder.isStreamEmpty(), pos);

0 commit comments

Comments
 (0)