Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public void test() {

SourceFile file = CxxAstScanner.scanSingleFile(new File("src/test/resources/checks/ClassComplexity.cc"), check);
CheckMessagesVerifier.verify(file.getCheckMessages())
.next().atLine(9).withMessage("Class has a complexity of 9 which is greater than 5 authorized.")
.next().atLine(9).withMessage("Class has a complexity of 10 which is greater than 5 authorized.")
.noMore();
}

Expand Down
4 changes: 2 additions & 2 deletions cxx-squid/src/main/java/org/sonar/cxx/CxxAstScanner.java
Original file line number Diff line number Diff line change
Expand Up @@ -205,10 +205,10 @@ public SourceCode createSourceCode(SourceCode parentSourceCode, AstNode astNode)
.build());

// to emit a 'new file' event to the internals of the plugin
builder.withSquidAstVisitor(new CxxFileVisitor(context));
builder.withSquidAstVisitor(new CxxFileVisitor<Grammar>(context));

// log syntax errors
builder.withSquidAstVisitor(new CxxParseErrorLoggerVisitor(context));
builder.withSquidAstVisitor(new CxxParseErrorLoggerVisitor<Grammar>(context));

/* External visitors (typically Check ones) */
for (SquidAstVisitor<Grammar> visitor : visitors) {
Expand Down
28 changes: 28 additions & 0 deletions cxx-squid/src/main/java/org/sonar/cxx/api/CxxGrammar.java
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,34 @@ public class CxxGrammar extends Grammar {
public Rule virtSpecifier;
public Rule pureSpecifier;

// cli extension
public Rule cliTopLevelVisibility;
public Rule cliFinallyClause;
public Rule cliEventDefinition;
public Rule cliEventModifiers;
public Rule cliPropertyOrEventName;
public Rule cliEventType;
public Rule cliParameterArray;
public Rule cliPropertyDefinition;
public Rule cliPropertyModifiers;
public Rule cliFunctionDefinition;
public Rule cliPropertyIndexes;
public Rule cliPropertyIndexParameterList;
public Rule cliAccessorSpecification;
public Rule cliAccessorDeclaration;
public Rule cliDelegateSpecifier;
public Rule cliGenericDeclaration;
public Rule cliGenericParameterList;
public Rule cliConstraintClauseList;
public Rule cliConstraintItemList;
public Rule cliGenericParameter;
public Rule cliGenericId;
public Rule cliGenericName;
public Rule cliGenericArgumentList;
public Rule cliGenericArgument;
public Rule cliConstraintClause;
public Rule cliConstraintItem;

// Derived classes
public Rule baseClause;
public Rule baseSpecifierList;
Expand Down
5 changes: 4 additions & 1 deletion cxx-squid/src/main/java/org/sonar/cxx/api/CxxKeyword.java
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,10 @@ public enum CxxKeyword implements TokenType {
OR("or"),
OR_EQ("or_eq"),
XOR("xor"),
XOR_EQ("xor_eq");
XOR_EQ("xor_eq"),

// C++/CLI keywords
GCNEW("gcnew");

private final String value;

Expand Down
Loading