@@ -435,14 +435,15 @@ impl Loc for JavaCode {
435435 use Java :: * ;
436436
437437 let ( start, end) = init ( node, stats, is_func_space, is_unit) ;
438-
439- match node . object ( ) . kind_id ( ) . into ( ) {
440- Program => { }
438+ let kind_id = node . object ( ) . kind_id ( ) . into ( ) ;
439+ match kind_id {
440+ Block | Program => { }
441441 Comment => {
442442 add_cloc_lines ( stats, start, end) ;
443443 }
444444 AssertStatement | BreakStatement | ContinueStatement | DoStatement
445- | ExpressionStatement | ForStatement | IfStatement | ReturnStatement | Statement
445+ | ExpressionStatement | ForStatement | IfStatement | LocalVariableDeclaration
446+ | ReturnStatement | Statement
446447 | SwitchStatement | ThrowStatement | TryStatement | WhileStatement => {
447448 stats. logical_lines += 1 ;
448449 }
@@ -1218,34 +1219,37 @@ mod tests {
12181219 JavaParser ,
12191220 loc,
12201221 [
1221- ( sloc, 1 , usize ) , // The number of lines is 1
1222- // (ploc, 1, usize), // The number of code lines is 1
1223- // (lloc, 1, usize), // The number of statements is 1
1224- // (cloc, 0, usize), // The number of comments is 0
1225- // (blank, 0, usize) // The number of blank lines is 0
1222+ ( lloc, 1 , usize ) , // The number of statements is 1
1223+ ( cloc, 0 , usize ) , // The number of comments is 0
12261224 ]
12271225 ) ;
12281226 }
12291227
1230- // #[test]
1228+ #[ test]
12311229 fn java_statement_inline_loc ( ) {
12321230 check_metrics ! (
1233- "for (i = 0; i < 100; i++) { printf (\" hello\" ); }" ,
1231+ "for (i = 0; i < 100; i++) { System.out.println (\" hello\" ); }" ,
12341232 "foo.java" ,
12351233 JavaParser ,
12361234 loc,
12371235 [
1238- ( sloc, 1 , usize ) , // The number of lines is 1
12391236 ( ploc, 1 , usize ) , // The number of code lines is 1
1240- ( lloc, 2 , usize ) , // The number of statements is 1
1237+ ( lloc, 2 , usize ) , // The number of statements is 2
12411238 ( cloc, 0 , usize ) , // The number of comments is 0
1242- ( blank, 0 , usize ) // The number of blank lines is 0
12431239 ]
12441240 ) ;
12451241 }
12461242
1247- // #[test]
1243+ #[ test]
1244+ #[ ignore] // lloc incorrect
12481245 fn java_general_loc ( ) {
1246+ let nr_ploc = 4 ;
1247+ let nr_statements = 3 ;
1248+ let nr_comments = 7 ;
1249+ let nr_blanks = 2 ;
1250+
1251+ let expected_sloc = nr_statements + nr_comments + nr_blanks + 1 ; // ? sloc always seems +1 higher
1252+
12491253 check_metrics ! (
12501254 "
12511255 int max = 10;
@@ -1256,19 +1260,19 @@ mod tests {
12561260 to: max
12571261 and print each value of i
12581262 */
1259- for (int i = 0; i <= max; i = i = 1) {
1263+ for (int i = 0; i <= max; i = i + 1) {
12601264 // Print the value i
12611265 System.out.println(i);
12621266 }" ,
12631267 "foo.java" ,
12641268 JavaParser ,
12651269 loc,
12661270 [
1267- ( sloc, 13 , usize ) , // The number of lines is 13
1268- ( ploc, 4 , usize ) , // The number of code lines is 4
1269- ( lloc, 2 , usize ) , // The number of statements is 2
1270- ( cloc, 7 , usize ) , // The number of comments is 7
1271- ( blank, 2 , usize ) // The number of blank lines is 2
1271+ ( sloc, expected_sloc , usize ) , // The number of lines is 11 (should be 10?)
1272+ ( ploc, nr_ploc , usize ) , // The number of code lines is 4
1273+ ( lloc, nr_statements , usize ) , // The number of statements is 3
1274+ ( cloc, nr_comments , usize ) , // The number of comments is 7
1275+ ( blank, nr_blanks , usize ) // The number of blank lines is 2
12721276 ]
12731277 ) ;
12741278 }
0 commit comments