Skip to content

Commit 693c17a

Browse files
Gama11Gama11
authored
Avoid deprecation warnings with haxeparser 3.3.0 (#290)
TokenDefPrinter.print() was deprecated (outputs "use toString() instead" warnings when used).
1 parent 217e863 commit 693c17a

File tree

9 files changed

+22
-28
lines changed

9 files changed

+22
-28
lines changed

‎src/checkstyle/checks/block/NeedBracesCheck.hx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,11 +144,11 @@ class NeedBracesCheck extends Check {
144144
}
145145
else {
146146
if (singleLine) {
147-
logPos('Body of "${TokenDefPrinter.print(parent.tok)}" on same line', child.pos);
147+
logPos('Body of "$parent" on same line', child.pos);
148148
return;
149149
}
150150
}
151-
logPos('No braces used for body of "${TokenDefPrinter.print(parent.tok)}"', child.pos);
151+
logPos('No braces used for body of "$parent"', child.pos);
152152
}
153153

154154
function checkIfElseSingleline(parent:TokenTree, child:TokenTree):Bool {

‎src/checkstyle/checks/imports/UnusedImportCheck.hx‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package checkstyle.checks.imports;
33
import checkstyle.token.TokenTree;
44
import checkstyle.utils.TokenTreeCheckUtils;
55
import haxe.io.Path;
6-
import haxeparser.Data;
76

87
using checkstyle.utils.ArrayUtils;
98

@@ -98,12 +97,12 @@ class UnusedImportCheck extends Check {
9897
case Kwd(KwdPackage):
9998
case Semicolon: return moduleName.toString();
10099
case Kwd(KwdIn):
101-
if (token.parent.tok.match(Dot)) moduleName.add(TokenDefPrinter.print(token.tok));
100+
if (token.parent.tok.match(Dot)) moduleName.add(token.toString());
102101
else moduleName.add(" in ");
103102
case Const(CIdent("as")):
104-
if (token.parent.tok.match(Dot)) moduleName.add(TokenDefPrinter.print(token.tok));
103+
if (token.parent.tok.match(Dot)) moduleName.add(token.toString());
105104
else moduleName.add(" as ");
106-
default: moduleName.add(TokenDefPrinter.print(token.tok));
105+
default: moduleName.add(token.toString());
107106
}
108107
token = token.getFirstChild();
109108
}
@@ -127,7 +126,7 @@ class UnusedImportCheck extends Check {
127126

128127
function checkUsage(typeName:String, moduleName:String, importTok:TokenTree, idents:Array<TokenTree>, stringLiterals:Array<TokenTree>) {
129128
for (ident in idents) {
130-
var name:String = TokenDefPrinter.print(ident.tok);
129+
var name:String = ident.toString();
131130
if (!checkName(typeName, moduleName, name)) continue;
132131
switch (ident.parent.tok) {
133132
case Kwd(KwdClass), Kwd(KwdInterface), Kwd(KwdAbstract), Kwd(KwdEnum), Kwd(KwdTypedef): continue;
@@ -136,24 +135,24 @@ class UnusedImportCheck extends Check {
136135
}
137136
}
138137
for (literal in stringLiterals) {
139-
var names : Array<String> = extractLiteralNames(TokenDefPrinter.print (literal.tok));
138+
var names:Array<String> = extractLiteralNames(literal.toString());
140139
for (name in names) {
141140
if (checkName(typeName, moduleName, name)) return;
142141
}
143142
}
144143
logPos('Unused import "$moduleName" detected', importTok.pos);
145144
}
146145

147-
function extractLiteralNames(text : String):Array<String> {
148-
var names : Array<String> = [];
149-
var interpols : Array<String> = [];
150-
var interpolRegEx : EReg = ~/\$\{([^\}]+)\}/g;
146+
function extractLiteralNames(text:String):Array<String> {
147+
var names:Array<String> = [];
148+
var interpols:Array<String> = [];
149+
var interpolRegEx:EReg = ~/\$\{([^\}]+)\}/g;
151150
while (true) {
152151
if (!interpolRegEx.match(text)) break;
153152
interpols.push(interpolRegEx.matched(1));
154153
text = interpolRegEx.matchedRight();
155154
}
156-
var namesRegEx : EReg = ~/([A-Z][A-Za-z0-9_]*)/g;
155+
var namesRegEx:EReg = ~/([A-Z][A-Za-z0-9_]*)/g;
157156
for (interpol in interpols) {
158157
while (true) {
159158
if (!namesRegEx.match(interpol)) break;

‎src/checkstyle/checks/whitespace/OperatorWhitespaceCheck.hx‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import checkstyle.token.TokenTree;
44
import checkstyle.utils.TokenTreeCheckUtils;
55
import checkstyle.checks.whitespace.WhitespaceCheckBase.WhitespacePolicy;
66
import checkstyle.checks.whitespace.WhitespaceCheckBase.WhitespaceUnaryPolicy;
7-
import haxeparser.Data;
87

98
@name("OperatorWhitespace")
109
@desc("Checks that whitespace is present or absent around a operators.")
@@ -170,6 +169,6 @@ class OperatorWhitespaceCheck extends WhitespaceCheckBase {
170169
}
171170

172171
override function violation(tok:TokenTree, policy:String) {
173-
logPos('OperatorWhitespace policy "$policy" violated by "${TokenDefPrinter.print(tok.tok)}"', tok.pos);
172+
logPos('OperatorWhitespace policy "$policy" violated by "$tok"', tok.pos);
174173
}
175174
}

‎src/checkstyle/checks/whitespace/SeparatorWhitespaceCheck.hx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class SeparatorWhitespaceCheck extends WhitespaceCheckBase {
3535

3636
override function violation(tok:TokenTree, policy:String) {
3737
if (isWrapped(tok, cast (policy, WhitespacePolicy))) return;
38-
logPos('SeparatorWhitespace policy "$policy" violated by "${TokenDefPrinter.print(tok.tok)}"', tok.pos);
38+
logPos('SeparatorWhitespace policy "$policy" violated by "$tok"', tok.pos);
3939
}
4040

4141
function isWrapped(tok:TokenTree, policy:WhitespacePolicy):Bool {

‎src/checkstyle/checks/whitespace/WhitespaceAfterCheck.hx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ class WhitespaceAfterCheck extends Check {
9494
var contentAfter:String = checker.file.content.substr(tok.pos.max, 1);
9595
if (~/^(\s|)$/.match(contentAfter)) continue;
9696

97-
logPos('No whitespace after "${TokenDefPrinter.print(tok.tok)}"', tok.pos);
97+
logPos('No whitespace after "$tok"', tok.pos);
9898
}
9999
}
100100
}

‎src/checkstyle/checks/whitespace/WhitespaceAroundCheck.hx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -132,15 +132,15 @@ class WhitespaceAroundCheck extends Check {
132132
var linePos:LinePos = checker.getLinePos(tok.pos.min);
133133
var line:String = checker.lines[linePos.line];
134134
var before:String = line.substr(0, linePos.ofs);
135-
var tokLen:Int = TokenDefPrinter.print(tok.tok).length;
135+
var tokLen:Int = tok.toString().length;
136136
var after:String = line.substr(linePos.ofs + tokLen);
137137

138138
if (!(~/^.*\s$/.match(before))) {
139-
logPos('No whitespace around "${TokenDefPrinter.print(tok.tok)}"', tok.pos);
139+
logPos('No whitespace around "$tok"', tok.pos);
140140
continue;
141141
}
142142
if (!(~/^(\s.*|)$/.match(after))) {
143-
logPos('No whitespace around "${TokenDefPrinter.print(tok.tok)}"', tok.pos);
143+
logPos('No whitespace around "$tok"', tok.pos);
144144
continue;
145145
}
146146
}

‎src/checkstyle/checks/whitespace/WhitespaceCheckBase.hx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ class WhitespaceCheckBase extends Check {
6767

6868
function checkWhitespaceExt(tok:TokenTree, checkCallback:WhitespacePolicyCheck) {
6969
var linePos:LinePos = checker.getLinePos(tok.pos.min);
70-
var tokLen:Int = TokenDefPrinter.print(tok.tok).length;
70+
var tokLen:Int = tok.toString().length;
7171
if (tok.tok.match(IntInterval(_))) {
7272
linePos = checker.getLinePos(tok.pos.max - 3);
7373
tokLen = 3;

‎src/checkstyle/checks/whitespace/WrapCheckBase.hx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,18 +36,18 @@ class WrapCheckBase extends Check {
3636
var linePos:LinePos = checker.getLinePos(tok.pos.min);
3737
var line:String = checker.lines[linePos.line];
3838
var before:String = line.substr(0, linePos.ofs);
39-
var tokLen:Int = TokenDefPrinter.print(tok.tok).length;
39+
var tokLen:Int = tok.toString().length;
4040
var after:String = line.substr(linePos.ofs + tokLen);
4141

4242
if (~/^\s*$/.match(before)) {
4343
if (option != NL) {
44-
logPos('Token "${TokenDefPrinter.print(tok.tok)}" must be at the end of the line', tok.pos);
44+
logPos('Token "$tok" must be at the end of the line', tok.pos);
4545
continue;
4646
}
4747
}
4848
if (~/^\s*(\/\/.*|\/\*.*|)$/.match(after)) {
4949
if (option != EOL) {
50-
logPos('Token "${TokenDefPrinter.print(tok.tok)}" must be on a new line', tok.pos);
50+
logPos('Token "$tok" must be on a new line', tok.pos);
5151
}
5252
}
5353
}

‎src/checkstyle/token/TokenTree.hx‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -103,10 +103,6 @@ class TokenTree extends Token {
103103
return false;
104104
}
105105

106-
override public function toString():String {
107-
return printTokenTree();
108-
}
109-
110106
public function printTokenTree(prefix:String = ""):String {
111107
var buf:StringBuf = new StringBuf();
112108
if (tok != null) buf.add('$prefix${tok}\t\t\t\t${getPos()}');

0 commit comments

Comments
 (0)