Skip to content

Commit daa63e3

Browse files
committed
Merge pull request #862 from guwirth/deprectated-SQ-5.5-API
mark deprectated SQ 5.5 API
2 parents 42f0627 + 9acb350 commit daa63e3

35 files changed

+312
-312
lines changed

cxx-squid/src/main/java/org/sonar/cxx/lexer/CxxLexer.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public final class CxxLexer {
4646
private CxxLexer() {
4747
}
4848

49-
public static Lexer create(Preprocessor... preprocessors) { //@toto deprecated Preprocessor
49+
public static Lexer create(Preprocessor... preprocessors) { //@todo deprecated Preprocessor
5050
return create(new CxxConfiguration(), preprocessors);
5151
}
5252

@@ -55,7 +55,7 @@ public static Lexer create(Preprocessor... preprocessors) { //@toto deprecated P
5555
//private static final String FLOAT_SUFFIX = "(f|l|F|L)";
5656
private static final String UD_SUFFIX = "([_a-zA-Z]([_a-zA-Z0-9]*+))"; // ud-suffix: identifier (including INTEGER_SUFFIX, FLOAT_SUFFIX)
5757

58-
public static Lexer create(CxxConfiguration conf, Preprocessor... preprocessors) { //@toto deprecated Preprocessor
58+
public static Lexer create(CxxConfiguration conf, Preprocessor... preprocessors) { //@todo deprecated Preprocessor
5959
Lexer.Builder builder = Lexer.builder()
6060
.withCharset(conf.getCharset())
6161
.withFailIfNoChannelToConsumeOneCharacter(true)
@@ -91,7 +91,7 @@ public static Lexer create(CxxConfiguration conf, Preprocessor... preprocessors)
9191
.withChannel(new PunctuatorChannel(CxxPunctuator.values()))
9292
.withChannel(new UnknownCharacterChannel());
9393

94-
for (Preprocessor preprocessor : preprocessors) { //@toto deprecated Preprocessor
94+
for (Preprocessor preprocessor : preprocessors) { //@todo deprecated Preprocessor
9595
builder.withPreprocessor(preprocessor);
9696
}
9797

cxx-squid/src/main/java/org/sonar/cxx/preprocessor/ExpressionEvaluator.java

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -200,9 +200,9 @@ BigInteger evalLogicalAndExpression(AstNode exprAst) {
200200
}
201201

202202
BigInteger evalEqualityExpression(AstNode exprAst) {
203-
String operator = exprAst.getChild(1).getTokenValue(); //@toto deprecated getChild
204-
AstNode lhs = exprAst.getChild(0); //@toto deprecated getChild
205-
AstNode rhs = exprAst.getChild(2); //@toto deprecated getChild
203+
String operator = exprAst.getChild(1).getTokenValue(); //@todo deprecated getChild
204+
AstNode lhs = exprAst.getChild(0); //@todo deprecated getChild
205+
AstNode rhs = exprAst.getChild(2); //@todo deprecated getChild
206206
boolean result;
207207
if ("==".equals(operator)) {
208208
result = evalToInt(lhs).compareTo(evalToInt(rhs)) == 0;
@@ -214,8 +214,8 @@ BigInteger evalEqualityExpression(AstNode exprAst) {
214214

215215
int noChildren = exprAst.getNumberOfChildren();
216216
for (int i = 4; i < noChildren; i += 2) {
217-
operator = exprAst.getChild(i - 1).getTokenValue(); //@toto deprecated getChild
218-
rhs = exprAst.getChild(i); //@toto deprecated getChild
217+
operator = exprAst.getChild(i - 1).getTokenValue(); //@todo deprecated getChild
218+
rhs = exprAst.getChild(i); //@todo deprecated getChild
219219
if ("==".equals(operator)) {
220220
result = result == eval(rhs);
221221
} else if ("!=".equals(operator)) {
@@ -229,9 +229,9 @@ BigInteger evalEqualityExpression(AstNode exprAst) {
229229
}
230230

231231
BigInteger evalRelationalExpression(AstNode exprAst) {
232-
String operator = exprAst.getChild(1).getTokenValue(); //@toto deprecated getChild
233-
AstNode lhs = exprAst.getChild(0); //@toto deprecated getChild
234-
AstNode rhs = exprAst.getChild(2); //@toto deprecated getChild
232+
String operator = exprAst.getChild(1).getTokenValue(); //@todo deprecated getChild
233+
AstNode lhs = exprAst.getChild(0); //@todo deprecated getChild
234+
AstNode rhs = exprAst.getChild(2); //@todo deprecated getChild
235235
boolean result;
236236
if ("<".equals(operator)) {
237237
result = evalToInt(lhs).compareTo(evalToInt(rhs)) < 0;
@@ -248,8 +248,8 @@ BigInteger evalRelationalExpression(AstNode exprAst) {
248248
BigInteger resultAsInt;
249249
int noChildren = exprAst.getNumberOfChildren();
250250
for (int i = 4; i < noChildren; i += 2) {
251-
operator = exprAst.getChild(i - 1).getTokenValue(); //@toto deprecated getChild
252-
rhs = exprAst.getChild(i); //@toto deprecated getChild
251+
operator = exprAst.getChild(i - 1).getTokenValue(); //@todo deprecated getChild
252+
rhs = exprAst.getChild(i); //@todo deprecated getChild
253253

254254
resultAsInt = result ? BigInteger.ONE : BigInteger.ZERO;
255255
if ("<".equals(operator)) {
@@ -271,9 +271,9 @@ BigInteger evalRelationalExpression(AstNode exprAst) {
271271
// ///////////////// bitwise expressions ///////////////////////
272272
BigInteger evalAndExpression(AstNode exprAst) {
273273
int noChildren = exprAst.getNumberOfChildren();
274-
BigInteger result = evalToInt(exprAst.getChild(0)); //@toto deprecated getChild
274+
BigInteger result = evalToInt(exprAst.getChild(0)); //@todo deprecated getChild
275275
for (int i = 2; i < noChildren; i += 2) {
276-
AstNode operand = exprAst.getChild(i); //@toto deprecated getChild
276+
AstNode operand = exprAst.getChild(i); //@todo deprecated getChild
277277
result = result.and(evalToInt(operand));
278278
}
279279

@@ -282,9 +282,9 @@ BigInteger evalAndExpression(AstNode exprAst) {
282282

283283
BigInteger evalInclusiveOrExpression(AstNode exprAst) {
284284
int noChildren = exprAst.getNumberOfChildren();
285-
BigInteger result = evalToInt(exprAst.getChild(0)); //@toto deprecated getChild
285+
BigInteger result = evalToInt(exprAst.getChild(0)); //@todo deprecated getChild
286286
for (int i = 2; i < noChildren; i += 2) {
287-
AstNode operand = exprAst.getChild(i); //@toto deprecated getChild
287+
AstNode operand = exprAst.getChild(i); //@todo deprecated getChild
288288
result = result.or(evalToInt(operand));
289289
}
290290

@@ -293,9 +293,9 @@ BigInteger evalInclusiveOrExpression(AstNode exprAst) {
293293

294294
BigInteger evalExclusiveOrExpression(AstNode exprAst) {
295295
int noChildren = exprAst.getNumberOfChildren();
296-
BigInteger result = evalToInt(exprAst.getChild(0)); //@toto deprecated getChild
296+
BigInteger result = evalToInt(exprAst.getChild(0)); //@todo deprecated getChild
297297
for (int i = 2; i < noChildren; i += 2) {
298-
AstNode operand = exprAst.getChild(i); //@toto deprecated getChild
298+
AstNode operand = exprAst.getChild(i); //@todo deprecated getChild
299299
result = result.xor(evalToInt(operand));
300300
}
301301

@@ -306,8 +306,8 @@ BigInteger evalExclusiveOrExpression(AstNode exprAst) {
306306
BigInteger evalUnaryExpression(AstNode exprAst) {
307307
// only 'unary-operator cast-expression' production is allowed in #if-context
308308

309-
String operator = exprAst.getChild(0).getTokenValue(); //@toto deprecated getChild
310-
AstNode operand = exprAst.getChild(1); //@toto deprecated getChild
309+
String operator = exprAst.getChild(0).getTokenValue(); //@todo deprecated getChild
310+
AstNode operand = exprAst.getChild(1); //@todo deprecated getChild
311311
if ("+".equals(operator)) {
312312
return evalToInt(operand);
313313
} else if ("-".equals(operator)) {
@@ -326,12 +326,12 @@ BigInteger evalUnaryExpression(AstNode exprAst) {
326326
BigInteger evalShiftExpression(AstNode exprAst) {
327327
String operator;
328328
AstNode rhs;
329-
BigInteger result = evalToInt(exprAst.getChild(0)); //@toto deprecated getChild
329+
BigInteger result = evalToInt(exprAst.getChild(0)); //@todo deprecated getChild
330330
int noChildren = exprAst.getNumberOfChildren();
331331

332332
for (int i = 2; i < noChildren; i += 2) {
333-
operator = exprAst.getChild(i - 1).getTokenValue(); //@toto deprecated getChild
334-
rhs = exprAst.getChild(i); //@toto deprecated getChild
333+
operator = exprAst.getChild(i - 1).getTokenValue(); //@todo deprecated getChild
334+
rhs = exprAst.getChild(i); //@todo deprecated getChild
335335

336336
if ("<<".equals(operator)) {
337337
//todo: limit to UINT64_MAX?
@@ -349,12 +349,12 @@ BigInteger evalShiftExpression(AstNode exprAst) {
349349
BigInteger evalAdditiveExpression(AstNode exprAst) {
350350
String operator;
351351
AstNode rhs;
352-
BigInteger result = evalToInt(exprAst.getChild(0)); //@toto deprecated getChild
352+
BigInteger result = evalToInt(exprAst.getChild(0)); //@todo deprecated getChild
353353
int noChildren = exprAst.getNumberOfChildren();
354354

355355
for (int i = 2; i < noChildren; i += 2) {
356-
operator = exprAst.getChild(i - 1).getTokenValue(); //@toto deprecated getChild
357-
rhs = exprAst.getChild(i); //@toto deprecated getChild
356+
operator = exprAst.getChild(i - 1).getTokenValue(); //@todo deprecated getChild
357+
rhs = exprAst.getChild(i); //@todo deprecated getChild
358358

359359
if ("+".equals(operator)) {
360360
result = result.add(evalToInt(rhs));
@@ -371,12 +371,12 @@ BigInteger evalAdditiveExpression(AstNode exprAst) {
371371
BigInteger evalMultiplicativeExpression(AstNode exprAst) {
372372
String operator;
373373
AstNode rhs;
374-
BigInteger result = evalToInt(exprAst.getChild(0)); //@toto deprecated getChild
374+
BigInteger result = evalToInt(exprAst.getChild(0)); //@todo deprecated getChild
375375
int noChildren = exprAst.getNumberOfChildren();
376376

377377
for (int i = 2; i < noChildren; i += 2) {
378-
operator = exprAst.getChild(i - 1).getTokenValue(); //@toto deprecated getChild
379-
rhs = exprAst.getChild(i); //@toto deprecated getChild
378+
operator = exprAst.getChild(i - 1).getTokenValue(); //@todo deprecated getChild
379+
rhs = exprAst.getChild(i); //@todo deprecated getChild
380380

381381
if ("*".equals(operator)) {
382382
result = result.multiply(evalToInt(rhs));
@@ -394,26 +394,26 @@ BigInteger evalMultiplicativeExpression(AstNode exprAst) {
394394

395395
BigInteger evalConditionalExpression(AstNode exprAst) {
396396
if (exprAst.getNumberOfChildren() == 5) {
397-
AstNode decisionOperand = exprAst.getChild(0); //@toto deprecated getChild
398-
AstNode trueCaseOperand = exprAst.getChild(2); //@toto deprecated getChild
399-
AstNode falseCaseOperand = exprAst.getChild(4); //@toto deprecated getChild
397+
AstNode decisionOperand = exprAst.getChild(0); //@todo deprecated getChild
398+
AstNode trueCaseOperand = exprAst.getChild(2); //@todo deprecated getChild
399+
AstNode falseCaseOperand = exprAst.getChild(4); //@todo deprecated getChild
400400
return eval(decisionOperand) ? evalToInt(trueCaseOperand) : evalToInt(falseCaseOperand);
401401
} else {
402-
AstNode decisionOperand = exprAst.getChild(0); //@toto deprecated getChild
403-
AstNode falseCaseOperand = exprAst.getChild(3); //@toto deprecated getChild
402+
AstNode decisionOperand = exprAst.getChild(0); //@todo deprecated getChild
403+
AstNode falseCaseOperand = exprAst.getChild(3); //@todo deprecated getChild
404404
BigInteger decision = evalToInt(decisionOperand);
405405
return decision.compareTo(BigInteger.ZERO) != 0 ? decision : evalToInt(falseCaseOperand);
406406
}
407407
}
408408

409409
BigInteger evalPrimaryExpression(AstNode exprAst) {
410410
// case "( expression )"
411-
return evalToInt(exprAst.getChild(1)); //@toto deprecated getChild
411+
return evalToInt(exprAst.getChild(1)); //@todo deprecated getChild
412412
}
413413

414414
BigInteger evalDefinedExpression(AstNode exprAst) {
415415
int posOfMacroName = exprAst.getNumberOfChildren() == 2 ? 1 : 2;
416-
String macroName = exprAst.getChild(posOfMacroName).getTokenValue(); //@toto deprecated getChild
416+
String macroName = exprAst.getChild(posOfMacroName).getTokenValue(); //@todo deprecated getChild
417417
String value = preprocessor.valueOf(macroName);
418418

419419
LOG.trace("expanding '{}' to '{}'", macroName, value);
@@ -422,7 +422,7 @@ BigInteger evalDefinedExpression(AstNode exprAst) {
422422
}
423423

424424
BigInteger evalFunctionlikeMacro(AstNode exprAst) {
425-
String macroName = exprAst.getChild(0).getTokenValue(); //@toto deprecated getChild
425+
String macroName = exprAst.getChild(0).getTokenValue(); //@todo deprecated getChild
426426
List<Token> tokens = exprAst.getTokens();
427427
List<Token> restTokens = tokens.subList(1, tokens.size());
428428
String value = preprocessor.expandFunctionLikeMacro(macroName, restTokens);

cxx-squid/src/main/java/org/sonar/cxx/preprocessor/IncludeLexer.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@ public final class IncludeLexer {
3434
private IncludeLexer() {
3535
}
3636

37-
public static Lexer create(Preprocessor... preprocessors) { //@toto deprecated Preprocessor
37+
public static Lexer create(Preprocessor... preprocessors) { //@todo deprecated Preprocessor
3838
return create(new CxxConfiguration(), preprocessors);
3939
}
4040

41-
public static Lexer create(CxxConfiguration conf, Preprocessor... preprocessors) { //@toto deprecated Preprocessor
41+
public static Lexer create(CxxConfiguration conf, Preprocessor... preprocessors) { //@todo deprecated Preprocessor
4242
Lexer.Builder builder = Lexer.builder()
4343
.withCharset(conf.getCharset())
4444
.withFailIfNoChannelToConsumeOneCharacter(true)
@@ -47,7 +47,7 @@ public static Lexer create(CxxConfiguration conf, Preprocessor... preprocessors)
4747
.withChannel(commentRegexp("/\\*", ANY_CHAR + "*?", "\\*/"))
4848
.withChannel(new BlackHoleChannel(".*"));
4949

50-
for (Preprocessor preprocessor : preprocessors) { //@toto deprecated Preprocessor
50+
for (Preprocessor preprocessor : preprocessors) { //@todo deprecated Preprocessor
5151
builder.withPreprocessor(preprocessor);
5252
}
5353

cxx-squid/src/main/java/org/sonar/cxx/preprocessor/JoinStringsPreprocessor.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@
2929
import com.sonar.sslr.api.PreprocessorAction; //@todo: deprecated, see http://javadocs.sonarsource.org/4.5.2/apidocs/deprecated-list.html
3030
import com.sonar.sslr.api.Token;
3131

32-
public class JoinStringsPreprocessor extends Preprocessor { //@toto deprecated Preprocessor
32+
public class JoinStringsPreprocessor extends Preprocessor { //@todo deprecated Preprocessor
3333

3434
@Override
35-
public PreprocessorAction process(List<Token> tokens) { //@toto deprecated PreprocessorAction
35+
public PreprocessorAction process(List<Token> tokens) { //@todo deprecated PreprocessorAction
3636
Token token = tokens.get(0);
3737

3838
if (token.getType() == CxxTokenType.STRING) {
@@ -61,12 +61,12 @@ public PreprocessorAction process(List<Token> tokens) { //@toto deprecated Prepr
6161
.setValueAndOriginalValue("\"" + stripQuotes(token.getValue()) + sb.toString() + "\"")
6262
.build()
6363
);
64-
return new PreprocessorAction(numberOfStrings, Collections.EMPTY_LIST, tokensToInject); //@toto deprecated PreprocessorAction
64+
return new PreprocessorAction(numberOfStrings, Collections.EMPTY_LIST, tokensToInject); //@todo deprecated PreprocessorAction
6565
}
6666

67-
return PreprocessorAction.NO_OPERATION; //@toto deprecated PreprocessorAction
67+
return PreprocessorAction.NO_OPERATION; //@todo deprecated PreprocessorAction
6868
}
69-
return PreprocessorAction.NO_OPERATION; //@toto deprecated PreprocessorAction
69+
return PreprocessorAction.NO_OPERATION; //@todo deprecated PreprocessorAction
7070
}
7171

7272
private String stripQuotes(String str) {

cxx-squid/src/test/java/org/sonar/cxx/parser/ClassesTest.java

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,11 @@ public void classSpecifier_reallife() {
4545
public void classHead() {
4646
p.setRootRule(g.rule(CxxGrammarImpl.classHead));
4747

48-
g.rule(CxxGrammarImpl.classKey).mock(); //@toto deprecated
49-
g.rule(CxxGrammarImpl.classHeadName).mock(); //@toto deprecated
50-
g.rule(CxxGrammarImpl.attributeSpecifierSeq).mock(); //@toto deprecated
51-
g.rule(CxxGrammarImpl.baseClause).mock(); //@toto deprecated
52-
g.rule(CxxGrammarImpl.classVirtSpecifier).mock(); //@toto deprecated
48+
g.rule(CxxGrammarImpl.classKey).mock(); //@todo deprecated
49+
g.rule(CxxGrammarImpl.classHeadName).mock(); //@todo deprecated
50+
g.rule(CxxGrammarImpl.attributeSpecifierSeq).mock(); //@todo deprecated
51+
g.rule(CxxGrammarImpl.baseClause).mock(); //@todo deprecated
52+
g.rule(CxxGrammarImpl.classVirtSpecifier).mock(); //@todo deprecated
5353

5454
assertThat(p).matches("classKey classHeadName");
5555
assertThat(p).matches("classKey attributeSpecifierSeq classHeadName");
@@ -65,8 +65,8 @@ public void classHead() {
6565
public void classHeadName() {
6666
p.setRootRule(g.rule(CxxGrammarImpl.classHeadName));
6767

68-
g.rule(CxxGrammarImpl.nestedNameSpecifier).mock(); //@toto deprecated
69-
g.rule(CxxGrammarImpl.className).mock(); //@toto deprecated
68+
g.rule(CxxGrammarImpl.nestedNameSpecifier).mock(); //@todo deprecated
69+
g.rule(CxxGrammarImpl.className).mock(); //@todo deprecated
7070

7171
assertThat(p).matches("className");
7272
assertThat(p).matches("nestedNameSpecifier className");
@@ -76,8 +76,8 @@ public void classHeadName() {
7676
public void memberSpecification() {
7777
p.setRootRule(g.rule(CxxGrammarImpl.memberSpecification));
7878

79-
g.rule(CxxGrammarImpl.memberDeclaration).mock(); //@toto deprecated
80-
g.rule(CxxGrammarImpl.accessSpecifier).mock(); //@toto deprecated
79+
g.rule(CxxGrammarImpl.memberDeclaration).mock(); //@todo deprecated
80+
g.rule(CxxGrammarImpl.accessSpecifier).mock(); //@todo deprecated
8181

8282
assertThat(p).matches("memberDeclaration");
8383
assertThat(p).matches("memberDeclaration accessSpecifier :");
@@ -100,7 +100,7 @@ public void memberSpecification_reallife() {
100100
public void memberDeclaration() {
101101
p.setRootRule(g.rule(CxxGrammarImpl.memberDeclaration));
102102

103-
g.rule(CxxGrammarImpl.attributeSpecifierSeq).mock(); //@toto deprecated
103+
g.rule(CxxGrammarImpl.attributeSpecifierSeq).mock(); //@todo deprecated
104104
g.rule(CxxGrammarImpl.memberDeclSpecifierSeq).mock();
105105
g.rule(CxxGrammarImpl.memberDeclaratorList).mock();
106106
g.rule(CxxGrammarImpl.functionDefinition).mock();
@@ -113,7 +113,7 @@ public void memberDeclaration() {
113113
g.rule(CxxGrammarImpl.cliPropertyDefinition).mock();
114114
g.rule(CxxGrammarImpl.cliEventDefinition).mock();
115115
g.rule(CxxGrammarImpl.cliDelegateSpecifier).mock();
116-
g.rule(CxxGrammarImpl.cliGenericDeclaration).mock(); //@toto deprecated
116+
g.rule(CxxGrammarImpl.cliGenericDeclaration).mock(); //@todo deprecated
117117

118118
assertThat(p).matches(";");
119119
assertThat(p).matches("attributeSpecifierSeq memberDeclSpecifierSeq memberDeclaratorList ;");
@@ -195,12 +195,12 @@ public void memberDeclaratorList_reallife() {
195195
public void memberDeclarator() {
196196
p.setRootRule(g.rule(CxxGrammarImpl.memberDeclarator));
197197

198-
g.rule(CxxGrammarImpl.declarator).mock(); //@toto deprecated
198+
g.rule(CxxGrammarImpl.declarator).mock(); //@todo deprecated
199199
g.rule(CxxGrammarImpl.pureSpecifier).mock();
200200
g.rule(CxxGrammarImpl.braceOrEqualInitializer).mock();
201201
g.rule(CxxGrammarImpl.constantExpression).mock();
202202
g.rule(CxxGrammarImpl.attributeSpecifierSeq).mock();
203-
g.rule(CxxGrammarImpl.virtSpecifierSeq).mock(); //@toto deprecated
203+
g.rule(CxxGrammarImpl.virtSpecifierSeq).mock(); //@todo deprecated
204204

205205
assertThat(p).matches("declarator");
206206
assertThat(p).matches("declarator virtSpecifierSeq");
@@ -225,7 +225,7 @@ public void memberDeclarator_reallife() {
225225
public void virtSpecifierSeq() {
226226
p.setRootRule(g.rule(CxxGrammarImpl.virtSpecifierSeq));
227227

228-
g.rule(CxxGrammarImpl.virtSpecifier).mock(); //@toto deprecated
228+
g.rule(CxxGrammarImpl.virtSpecifier).mock(); //@todo deprecated
229229

230230
assertThat(p).matches("virtSpecifier");
231231
assertThat(p).matches("virtSpecifier virtSpecifier");
@@ -262,7 +262,7 @@ public void virtSpecifier() {
262262
public void baseSpecifierList() {
263263
p.setRootRule(g.rule(CxxGrammarImpl.baseSpecifierList));
264264

265-
g.rule(CxxGrammarImpl.baseSpecifier).mock(); //@toto deprecated
265+
g.rule(CxxGrammarImpl.baseSpecifier).mock(); //@todo deprecated
266266

267267
assertThat(p).matches("baseSpecifier");
268268
assertThat(p).matches("baseSpecifier ...");
@@ -276,9 +276,9 @@ public void baseSpecifierList() {
276276
public void baseSpecifier() {
277277
p.setRootRule(g.rule(CxxGrammarImpl.baseSpecifier));
278278

279-
g.rule(CxxGrammarImpl.baseTypeSpecifier).mock(); //@toto deprecated
279+
g.rule(CxxGrammarImpl.baseTypeSpecifier).mock(); //@todo deprecated
280280
g.rule(CxxGrammarImpl.attributeSpecifierSeq).mock();
281-
g.rule(CxxGrammarImpl.accessSpecifier).mock(); //@toto deprecated
281+
g.rule(CxxGrammarImpl.accessSpecifier).mock(); //@todo deprecated
282282

283283
assertThat(p).matches("baseTypeSpecifier");
284284
assertThat(p).matches("attributeSpecifierSeq baseTypeSpecifier");
@@ -294,9 +294,9 @@ public void baseSpecifier() {
294294
public void classOrDecltype() {
295295
p.setRootRule(g.rule(CxxGrammarImpl.classOrDecltype));
296296

297-
g.rule(CxxGrammarImpl.className).mock(); //@toto deprecated
297+
g.rule(CxxGrammarImpl.className).mock(); //@todo deprecated
298298
g.rule(CxxGrammarImpl.nestedNameSpecifier).mock();
299-
g.rule(CxxGrammarImpl.decltypeSpecifier).mock(); //@toto deprecated
299+
g.rule(CxxGrammarImpl.decltypeSpecifier).mock(); //@todo deprecated
300300

301301
assertThat(p).matches("className");
302302
assertThat(p).matches("nestedNameSpecifier className");

0 commit comments

Comments
 (0)