github
diff --git a/‎change_notes/2024-07-03-fix-fp-611-A3-1-5.md
Copy file name to clipboard
+2Lines changed: 2 additions & 0 deletions b/‎change_notes/2024-07-03-fix-fp-611-A3-1-5.md
Copy file name to clipboard
+2Lines changed: 2 additions & 0 deletions
diff --git a/‎cpp/autosar/test/rules/A3-1-5/NonTrivialNonTemplateFunctionDefinedInsideClassDefinition.expected
Copy file name to clipboard
-1Lines changed: 0 additions & 1 deletion b/‎cpp/autosar/test/rules/A3-1-5/NonTrivialNonTemplateFunctionDefinedInsideClassDefinition.expected
Copy file name to clipboard
-1Lines changed: 0 additions & 1 deletion
diff --git a/‎cpp/autosar/test/rules/A3-1-5/TrivialOrTemplateFunctionDefinedOutsideClassDefinition.expected
Copy file name to clipboard
+7-7Lines changed: 7 additions & 7 deletions b/‎cpp/autosar/test/rules/A3-1-5/TrivialOrTemplateFunctionDefinedOutsideClassDefinition.expected
Copy file name to clipboard
+7-7Lines changed: 7 additions & 7 deletions
diff --git a/‎cpp/autosar/test/rules/A3-1-5/test.cpp
Copy file name to clipboardExpand all lines: cpp/autosar/test/rules/A3-1-5/test.cpp
+15-1Lines changed: 15 additions & 1 deletion b/‎cpp/autosar/test/rules/A3-1-5/test.cpp
Copy file name to clipboardExpand all lines: cpp/autosar/test/rules/A3-1-5/test.cpp
+15-1Lines changed: 15 additions & 1 deletion
diff --git a/‎cpp/common/src/codingstandards/cpp/Class.qll
Copy file name to clipboardExpand all lines: cpp/common/src/codingstandards/cpp/Class.qll
+1-2Lines changed: 1 addition & 2 deletions b/‎cpp/common/src/codingstandards/cpp/Class.qll
Copy file name to clipboardExpand all lines: cpp/common/src/codingstandards/cpp/Class.qll
+1-2Lines changed: 1 addition & 2 deletions
@@ -0,0 +1,2 @@
+- `A3-1-5` - `NonTrivialNonTemplateFunctionDefinedInsideClassDefinition.ql`, `TrivialOrTemplateFunctionDefinedOutsideClassDefinition.ql`:
+  - Fixes #611. Relax definition of trivial length of trivial member function to 10 LOC.
@@ -1,2 +1 @@
-| test.cpp:12:7:12:13 | trivial | Non-Trivial or non-template function trivial is defined in the class body of $@. | test.cpp:2:7:2:7 | A | A |
 | test.cpp:26:7:26:9 | gcd | Non-Trivial or non-template function gcd is defined in the class body of $@. | test.cpp:2:7:2:7 | A | A |
@@ -1,7 +1,7 @@
-| test.cpp:58:5:58:11 | getB | The trivial member function getB is not defined in the class body of $@. | test.cpp:2:7:2:7 | A | A |
-| test.cpp:60:25:60:28 | d | The template member function d is not defined in the class body of $@. | test.cpp:2:7:2:7 | A | A |
-| test.cpp:62:5:62:8 | b | The trivial member function b is not defined in the class body of $@. | test.cpp:2:7:2:7 | A | A |
-| test.cpp:81:34:81:57 | complexCalculation | The template member function complexCalculation is not defined in the class body of $@. | test.cpp:64:29:64:29 | B<C> | B<C> |
-| test.cpp:97:47:97:53 | d | The template member function d is not defined in the class body of $@. | test.cpp:64:29:64:29 | B<C> | B<C> |
-| test.cpp:101:27:101:33 | b | The template member function b is not defined in the class body of $@. | test.cpp:64:29:64:29 | B<C> | B<C> |
-| test.cpp:106:27:106:36 | getB | The template member function getB is not defined in the class body of $@. | test.cpp:64:29:64:29 | B<C> | B<C> |
+| test.cpp:65:5:65:11 | getB | The trivial member function getB is not defined in the class body of $@. | test.cpp:2:7:2:7 | A | A |
+| test.cpp:67:25:67:28 | d | The template member function d is not defined in the class body of $@. | test.cpp:2:7:2:7 | A | A |
+| test.cpp:69:5:69:8 | b | The trivial member function b is not defined in the class body of $@. | test.cpp:2:7:2:7 | A | A |
+| test.cpp:88:34:88:57 | complexCalculation | The template member function complexCalculation is not defined in the class body of $@. | test.cpp:71:29:71:29 | B<C> | B<C> |
+| test.cpp:104:47:104:53 | d | The template member function d is not defined in the class body of $@. | test.cpp:71:29:71:29 | B<C> | B<C> |
+| test.cpp:108:27:108:33 | b | The template member function b is not defined in the class body of $@. | test.cpp:71:29:71:29 | B<C> | B<C> |
+| test.cpp:113:27:113:36 | getB | The template member function getB is not defined in the class body of $@. | test.cpp:71:29:71:29 | B<C> | B<C> |
@@ -9,7 +9,7 @@ class A {
 
   int getABar() { return 9; }
 
-  int trivial() { // NON_COMPLIANT
+  int not_trivial() { // COMPLIANT - with threshold of 10 loc
     ;
     ;
     ;
@@ -28,6 +28,13 @@ class A {
       return a;
     int result = gcd(b, (a % b));
     ;
+    ;
+    ;
+    ;
+    ;
+    ;
+    ;
+    ;
     return result;
   }
 
@@ -131,5 +138,12 @@ int FooBar::f1(int a, int b) { // COMPLIANT not a trivial function
       return a;
     int result = FooBar::f1(b, (a % b));
     ;
+    ;
+    ;
+    ;
+    ;
+    ;
+    ;
+    ;
   }
 }
@@ -149,8 +149,7 @@ class IntrospectedMemberFunction extends MemberFunction {
   }
 
   predicate hasTrivialLength() {
-    this.getBlock().getNumStmt() <= 3 and
-    not exists(this.getBlock().getStmt(_).getChildStmt())
+    this.getBlock().getLocation().getEndLine() - this.getBlock().getLocation().getStartLine() <= 10
   }
 
   predicate isSetter() {
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	+- `A3-1-5` - `NonTrivialNonTemplateFunctionDefinedInsideClassDefinition.ql`, `TrivialOrTemplateFunctionDefinedOutsideClassDefinition.ql`:
	`2`	`+ - Fixes #611. Relax definition of trivial length of trivial member function to 10 LOC.`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1 @@`
`1`		`-\| test.cpp:12:7:12:13 \| trivial \| Non-Trivial or non-template function trivial is defined in the class body of $@. \| test.cpp:2:7:2:7 \| A \| A \|`
`2`	`1`	`\| test.cpp:26:7:26:9 \| gcd \| Non-Trivial or non-template function gcd is defined in the class body of $@. \| test.cpp:2:7:2:7 \| A \| A \|`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ class A {`
`9`	`9`
`10`	`10`	`int getABar() { return 9; }`
`11`	`11`
`12`		`- int trivial() { // NON_COMPLIANT`
	`12`	`+ int not_trivial() { // COMPLIANT - with threshold of 10 loc`
`13`	`13`	`;`
`14`	`14`	`;`
`15`	`15`	`;`
`@@ -28,6 +28,13 @@ class A {`
`28`	`28`	`return a;`
`29`	`29`	`int result = gcd(b, (a % b));`
`30`	`30`	`;`
	`31`	`+ ;`
	`32`	`+ ;`
	`33`	`+ ;`
	`34`	`+ ;`
	`35`	`+ ;`
	`36`	`+ ;`
	`37`	`+ ;`
`31`	`38`	`return result;`
`32`	`39`	`}`
`33`	`40`
`@@ -131,5 +138,12 @@ int FooBar::f1(int a, int b) { // COMPLIANT not a trivial function`
`131`	`138`	`return a;`
`132`	`139`	`int result = FooBar::f1(b, (a % b));`
`133`	`140`	`;`
	`141`	`+ ;`
	`142`	`+ ;`
	`143`	`+ ;`
	`144`	`+ ;`
	`145`	`+ ;`
	`146`	`+ ;`
	`147`	`+ ;`
`134`	`148`	`}`
`135`	`149`	`}`
Original file line number	Diff line number	Diff line change
`@@ -149,8 +149,7 @@ class IntrospectedMemberFunction extends MemberFunction {`
`149`	`149`	`}`
`150`	`150`
`151`	`151`	`predicate hasTrivialLength() {`
`152`		`- this.getBlock().getNumStmt() <= 3 and`
`153`		`- not exists(this.getBlock().getStmt(_).getChildStmt())`
	`152`	`+ this.getBlock().getLocation().getEndLine() - this.getBlock().getLocation().getStartLine() <= 10`
`154`	`153`	`}`
`155`	`154`
`156`	`155`	`predicate isSetter() {`