Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Java LoC metric #694

Merged
merged 19 commits into from
Mar 23, 2022
Merged

Java LoC metric #694

Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
c98bc45
WIP of Java LoC metric
dburriss Oct 25, 2021
22190ba
Enables 2 passing simple tests
dburriss Oct 25, 2021
d14a724
Adds more individual loc tests
dburriss Oct 26, 2021
b988696
Initial impl of JavaCode Getter trait
dburriss Oct 26, 2021
3ce6450
Test cleanup
dburriss Oct 26, 2021
f28b458
Fix test
dburriss Oct 26, 2021
2d11dbf
Fixes handling of for loops
dburriss Nov 20, 2021
36cf32d
Adds while
dburriss Nov 20, 2021
2108244
Remove println
dburriss Feb 11, 2022
ca1b35c
Ran fmt
dburriss Feb 12, 2022
70a04ed
Reduce to handle only SLOC off by 1
dburriss Feb 22, 2022
aa42b7c
Adds ternary lloc to test
dburriss Feb 22, 2022
7d4f9f1
Adds expression grammar lloc
dburriss Feb 28, 2022
9c030c2
Removes expressions from count
dburriss Mar 2, 2022
c8112e1
Do not count expressions in for loop
dburriss Mar 2, 2022
c90d092
Removes debugging lines
dburriss Mar 2, 2022
8bac42f
Fixes for the recent Stats changes
dburriss Mar 19, 2022
c765293
Defines space kinds
dburriss Mar 20, 2022
0a7b404
Adds interface space
dburriss Mar 22, 2022
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
Prev Previous commit
Next Next commit
Removes expressions from count
  • Loading branch information
@dburriss
dburriss committed Mar 22, 2022
commit 9c030c26d721722dbf5e484a5c83c078e38f730e
148 changes: 106 additions & 42 deletions src/metrics/loc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -829,30 +829,25 @@ impl Loc for JavaCode {
add_cloc_lines(stats, start, end);
}
AssertStatement
dburriss marked this conversation as resolved.
Show resolved Hide resolved
| AssignmentExpression
| BreakStatement
| BinaryExpression
| CastExpression
| ContinueStatement
| DoStatement
| Declaration
| EnhancedForStatement
| ExpressionStatement
| IfStatement
| InstanceofExpression
| LambdaExpression
| LocalVariableDeclaration
| MethodInvocation
| ParenthesizedExpression
| PrimaryExpression
| ReturnStatement
| Statement
| SwitchStatement
| TernaryExpression
| ThrowStatement
| TryStatement
| UpdateExpression
| UnaryExpression => {
| WhileStatement => {
stats.logical_lines += 1;
println!("+1");
}
ForStatement => {
// handle binary check + increment
stats.logical_lines += 2;
dburriss marked this conversation as resolved.
Show resolved Hide resolved
println!("+2");
}
_ => {
check_comment_ends_on_code_line(stats, start);
Expand Down Expand Up @@ -2087,6 +2082,20 @@ mod tests {
);
}

#[test]
fn java_update_expression_lloc() {
check_metrics!(
"int i = 10;
i++;",
"foo.java",
JavaParser,
loc,
[
(lloc, 2, usize), // The number of statements is 2
]
);
}

#[test]
fn java_for_lloc() {
check_metrics!(
Expand Down Expand Up @@ -2124,30 +2133,96 @@ mod tests {
check_metrics!(
"
int i=0; // +1
while(i < 10) { // +2 paren exp + binary
while(i < 10) { // +1
i++; // +1
System.out.println(i); // +1
}",
"foo.java",
JavaParser,
loc,
[
(lloc, 5, usize), // The number of statements is 5
(lloc, 4, usize), // The number of statements is 4
]
);
}

#[test]
fn java_do_while_lloc() {
check_metrics!(
"
int i=0; // +1
do { // +1
i++; // +1
System.out.println(i); // +1
} while(i < 10)",
"foo.java",
JavaParser,
loc,
[
(lloc, 4, usize), // The number of statements is 4
]
);
}

#[test]
fn java_multi_lloc() {
fn java_switch_lloc() {
check_metrics!(
"switch(grade) { // +1
case 'A' :
System.out.println(\"Pass with distinction\"); // +1
break; // +1
case 'B' :
case 'C' :
System.out.println(\"Pass\"); // +1
break; // +1
case 'D' :
System.out.println(\"At risk\"); // +1
case 'F' :
System.out.println(\"Fail\"); // +1
break; // +1
default :
System.out.println(\"Invalid grade\"); // +1
}",
"foo.java",
JavaParser,
loc,
[
(lloc, 9, usize), // The number of statements is 6
]
);
}

#[test]
fn java_continue_lloc() {
check_metrics!(
"int max = 10; // +1

for (int i = 0; i < max; i++) { // +3
System.out.println(i); // +1
if(i % 2 == 0) { continue;} + 2
System.out.println(i); // +1
}",
"foo.java",
JavaParser,
loc,
[
(lloc, 7, usize), // The number of statements is 7
]
);
}

#[test]
fn java_try_lloc() {
check_metrics!(
"try { // +1
int[] myNumbers = {1, 2, 3}; // +1
System.out.println(myNumbers[10]); // +1
} catch (Exception e) {
System.out.println(e.getMessage()); // +1
throw e; // +1
}",
"foo.java",
JavaParser,
loc,
[
(lloc, 5, usize), // The number of statements is 5
]
Expand Down Expand Up @@ -2176,37 +2251,26 @@ mod tests {
);
}

// copy in 1 line at a time
//
//
//
//
//
//
//
//
//
//
#[test]
fn java_expressions_lloc() {
check_metrics!(
"int x = 10; // +1
x=+90; // +2 var + unary
int y = x * 2; // +2 var + binary
IntFunction double = (n) -> n*2; // +3 var + lambda + binary
int y2 = double(x); // +2 var + paren expression
System.out.println(\"double \" + x + \" = \" + y2); // +4 method + binary x 3
String message = (x % 2) == 0 ? \"Evenly done.\" : \"Oddly done.\"; // +5 lloc : 1 var assignment + ternary + binary + param exp + binary
Object done = (Runnable) () -> { System.out.println(\"Done!\"); }; // +4 var + cast + lamda + method invoc
String s = \"string\"; // +1
boolean isS = (s instanceof String); // +3 var assignment + paren exp + instanceof
done.run(); // +1 method invoc
"int x = 10; // +1 local var declaration
x=+90; // +1 expression statement
int y = x * 2; // +1 local var declaration
IntFunction double = (n) -> n*2; // +1 local var declaration
int y2 = double(x); // +1 local var declaration
System.out.println(\"double \" + x + \" = \" + y2); // +1 expression statement
String message = (x % 2) == 0 ? \"Evenly done.\" : \"Oddly done.\"; // +1 local var declaration
Object done = (Runnable) () -> { System.out.println(\"Done!\"); }; // +2 local var declaration + expression statement
String s = \"string\"; // +1 local var declaration
boolean isS = (s instanceof String); // +1 local var declaration
done.run(); // +1 expression statement
",
"foo.java",
JavaParser,
loc,
[
(lloc, 28, usize), // The number of statements is 28
(lloc, 12, usize), // The number of statements is 12
]
);
}
Expand Down Expand Up @@ -2264,7 +2328,7 @@ mod tests {

class HelloWorldApp {
public void main(String[] args) {
String message = args.length == 0 ? \"Hello empty world\" : \"Hello world\"; // +3 lloc : 1 var assignment + ternary + binary exp
String message = args.length == 0 ? \"Hello empty world\" : \"Hello world\"; // +1 lloc : 1 var assignment
System.out.println(message); // Display the string. +1 lloc
}
}",
Expand All @@ -2274,7 +2338,7 @@ mod tests {
[
(sloc, 12, usize), // The number of lines is 12
(ploc, 7, usize), // The number of code lines is 7
(lloc, 4, usize), // The number of statements is 4
(lloc, 2, usize), // The number of statements is 2
(cloc, 6, usize), // The number of comments is 6
(blank, 1, usize) // The number of blank lines is 1
]
Expand Down