Improved c++ readability.

jplag · Feb 9, 2024 · b25863c · b25863c
1 parent 63e9839
commit b25863c
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 22 deletions.
diff --git a/README.md b/README.md
@@ -22,8 +22,8 @@ In the following, a list of all supported languages with their supported languag
 | Language                                                   |                                                                                Version | CLI Argument Name | [state](https://github.com/jplag/JPlag/wiki/2.-Supported-Languages) |  parser   |
 |------------------------------------------------------------|---------------------------------------------------------------------------------------:|-------------------|:-------------------------------------------------------------------:|:---------:|
 | [Java](https://www.java.com)                               |                                                                                     21 | java              |                               mature                                |   JavaC   |
-| [C/C++](https://isocpp.org)                                |                                                                                     11 | cpp               |                               legacy                                |  JavaCC   |
-| [C/C++](https://isocpp.org)                                |                                                                                     14 | cpp2              |                                beta                                 |  ANTLR 4  |
+| [C](https://isocpp.org)                                    |                                                                                     11 | cpp               |                               legacy                                |  JavaCC   |
+| [C++](https://isocpp.org)                                  |                                                                                     14 | cpp2              |                                beta                                 |  ANTLR 4  |
 | [C#](https://docs.microsoft.com/en-us/dotnet/csharp/)      |                                                                                      6 | csharp            |                                beta                                 |  ANTLR 4  |
 | [Go](https://go.dev)                                       |                                                                                   1.17 | golang            |                                beta                                 |  ANTLR 4  |
 | [Kotlin](https://kotlinlang.org)                           |                                                                                    1.3 | kotlin            |                                beta                                 |  ANTLR 4  |

diff --git a/docs/2.-Supported-Languages.md b/docs/2.-Supported-Languages.md
@@ -1,4 +1,4 @@
-JPlag currently supports Java, C/C++, C#, Go, Kotlin, Python, R, Rust, Scala, Swift, and Scheme. Additionally, it has primitive support for text and prototypical support for EMF metamodels. A detailed list, including the supported language versions can be found in the [project readme](https://github.com/jplag/JPlag/blob/main/README.md#supported-languages).
+JPlag currently supports Java, C, C++, C#, Go, Kotlin, Python, R, Rust, Scala, Swift, and Scheme. Additionally, it has primitive support for text and prototypical support for EMF metamodels. A detailed list, including the supported language versions can be found in the [project readme](https://github.com/jplag/JPlag/blob/main/README.md#supported-languages).
 
 The language modules differ in their maturity due to their age and different usage frequencies.
 Thus, each frontend has a state label:

diff --git a/languages/cpp2/src/main/java/de/jplag/cpp2/CPPListener.java b/languages/cpp2/src/main/java/de/jplag/cpp2/CPPListener.java
@@ -33,29 +33,11 @@ class CPPListener extends AbstractAntlrListener {
 
         visit(FunctionDefinitionContext.class).map(FUNCTION_BEGIN, FUNCTION_END).addLocalScope().withSemantics(CodeSemantics::createControl);
 
-        visit(IterationStatementContext.class, rule -> rule.Do() != null).map(DO_BEGIN, DO_END).addLocalScope().withLoopSemantics();
-        visit(IterationStatementContext.class, rule -> rule.For() != null).map(FOR_BEGIN, FOR_END).addLocalScope().withLoopSemantics();
-        visit(IterationStatementContext.class, rule -> rule.While() != null && rule.Do() == null).map(WHILE_BEGIN, WHILE_END).addLocalScope()
-                .withLoopSemantics();
-
-        visit(SelectionStatementContext.class, rule -> rule.Switch() != null).map(SWITCH_BEGIN, SWITCH_END).addLocalScope()
-                .withSemantics(CodeSemantics::createControl);
-        visit(SelectionStatementContext.class, rule -> rule.If() != null).map(IF_BEGIN, IF_END).addLocalScope()
-                .withSemantics(CodeSemantics::createControl);
-        // possible problem: variable from if visible in else, but in reality is not -- doesn't really matter
-        visit(CPP14Parser.Else).map(ELSE).withSemantics(CodeSemantics::createControl);
-
-        visit(LabeledStatementContext.class, rule -> rule.Case() != null).map(CASE).withSemantics(CodeSemantics::createControl);
-        visit(LabeledStatementContext.class, rule -> rule.Default() != null).map(DEFAULT).withSemantics(CodeSemantics::createControl);
+        statementRules();
 
         visit(TryBlockContext.class).map(TRY_BEGIN, TRY_END).addLocalScope().withSemantics(CodeSemantics::createControl);
         visit(HandlerContext.class).map(CATCH_BEGIN, CATCH_END).addLocalScope().withSemantics(CodeSemantics::createControl);
 
-        visit(JumpStatementContext.class, rule -> rule.Break() != null).map(BREAK).withSemantics(CodeSemantics::createControl);
-        visit(JumpStatementContext.class, rule -> rule.Continue() != null).map(CONTINUE).withSemantics(CodeSemantics::createControl);
-        visit(JumpStatementContext.class, rule -> rule.Goto() != null).map(GOTO).withSemantics(CodeSemantics::createControl);
-        visit(JumpStatementContext.class, rule -> rule.Return() != null).map(RETURN).withSemantics(CodeSemantics::createControl);
-
         visit(ThrowExpressionContext.class).map(THROW).withSemantics(CodeSemantics::createControl);
 
         visit(NewExpressionContext.class, rule -> rule.newInitializer() != null).map(NEWCLASS).withSemantics(CodeSemantics::new);
@@ -73,6 +55,35 @@ class CPPListener extends AbstractAntlrListener {
                 .onEnter((rule, varReg) -> varReg.setNextVariableAccessType(VariableAccessType.WRITE));
         visit(BracedInitListContext.class).map(BRACED_INIT_BEGIN, BRACED_INIT_END).withSemantics(CodeSemantics::new);
 
+        typeSpecifierRule();
+        declarationRules();
+        expressionRules();
+        idRules();
+    }
+
+    private void statementRules() {
+        visit(IterationStatementContext.class, rule -> rule.Do() != null).map(DO_BEGIN, DO_END).addLocalScope().withLoopSemantics();
+        visit(IterationStatementContext.class, rule -> rule.For() != null).map(FOR_BEGIN, FOR_END).addLocalScope().withLoopSemantics();
+        visit(IterationStatementContext.class, rule -> rule.While() != null && rule.Do() == null).map(WHILE_BEGIN, WHILE_END).addLocalScope()
+                .withLoopSemantics();
+
+        visit(SelectionStatementContext.class, rule -> rule.Switch() != null).map(SWITCH_BEGIN, SWITCH_END).addLocalScope()
+                .withSemantics(CodeSemantics::createControl);
+        visit(SelectionStatementContext.class, rule -> rule.If() != null).map(IF_BEGIN, IF_END).addLocalScope()
+                .withSemantics(CodeSemantics::createControl);
+        // possible problem: variable from if visible in else, but in reality is not -- doesn't really matter
+        visit(CPP14Parser.Else).map(ELSE).withSemantics(CodeSemantics::createControl);
+
+        visit(LabeledStatementContext.class, rule -> rule.Case() != null).map(CASE).withSemantics(CodeSemantics::createControl);
+        visit(LabeledStatementContext.class, rule -> rule.Default() != null).map(DEFAULT).withSemantics(CodeSemantics::createControl);
+
+        visit(JumpStatementContext.class, rule -> rule.Break() != null).map(BREAK).withSemantics(CodeSemantics::createControl);
+        visit(JumpStatementContext.class, rule -> rule.Continue() != null).map(CONTINUE).withSemantics(CodeSemantics::createControl);
+        visit(JumpStatementContext.class, rule -> rule.Goto() != null).map(GOTO).withSemantics(CodeSemantics::createControl);
+        visit(JumpStatementContext.class, rule -> rule.Return() != null).map(RETURN).withSemantics(CodeSemantics::createControl);
+    }
+
+    private void typeSpecifierRule() {
         visit(SimpleTypeSpecifierContext.class, rule -> {
             if (hasAncestor(rule, MemberdeclarationContext.class, FunctionDefinitionContext.class)) {
                 return true;
@@ -99,7 +110,9 @@ class CPPListener extends AbstractAntlrListener {
                 variableRegistry.registerVariable(name, scope, true);
             }
         });
+    }
 
+    private void declarationRules() {
         mapApply(visit(SimpleDeclarationContext.class, rule -> {
             if (!hasAncestor(rule, FunctionBodyContext.class)) {
                 return false;
@@ -125,12 +138,17 @@ class CPPListener extends AbstractAntlrListener {
                 varReg.setNextVariableAccessType(VariableAccessType.WRITE);
             }
         });
+    }
+
+    private void expressionRules() {
         visit(ConditionalExpressionContext.class, rule -> rule.Question() != null).map(QUESTIONMARK).withSemantics(CodeSemantics::new);
 
         mapApply(visit(PostfixExpressionContext.class, rule -> rule.LeftParen() != null));
         visit(PostfixExpressionContext.class, rule -> rule.PlusPlus() != null || rule.MinusMinus() != null).map(ASSIGN)
                 .withSemantics(CodeSemantics::new).onEnter((rule, varReg) -> varReg.setNextVariableAccessType(VariableAccessType.READ_WRITE));
+    }
 
+    private void idRules() {
         visit(UnqualifiedIdContext.class).onEnter((ctx, varReg) -> {
             ParserRuleContext parentCtx = ctx.getParent().getParent();
             if (!parentCtx.getParent().getParent().getText().contains("(")) {
@@ -141,6 +159,8 @@ class CPPListener extends AbstractAntlrListener {
         });
     }
 
+
+
     private void mapApply(ContextVisitor<?> visitor) {
         visitor.onExit((ctx, varReg) -> varReg.setMutableWrite(false)).onEnter((ctx, varReg) -> {
             varReg.addAllNonLocalVariablesAsReads();