Adds while

Author: dburriss

src/metrics/loc.rs

@@ -430,41 +430,42 @@ impl Loc for CppCode {
     }
 }
 
-// impl fmt::Display for Java {
-//     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-//        write!(f, "{:?}", self)
-//     }
-// }
+impl fmt::Display for Java {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+       write!(f, "{:?}", self)
+    }
+}
 
 impl Loc for JavaCode {
     fn compute(node: &Node, stats: &mut Stats, is_func_space: bool, is_unit: bool) {
         use Java::*;
 
         let (start, end) = init(node, stats, is_func_space, is_unit);
         let kind_id : Java = node.object().kind_id().into();
-        //println!("KINDID {}", kind_id.to_string());
+        println!("KINDID {}", kind_id.to_string());
         match kind_id {
             Program => {}
             Comment => {
                 add_cloc_lines(stats, start, end);
             }
             AssertStatement
+            | AssignmentExpression
             | BreakStatement
             | BinaryExpression
             | ContinueStatement
             | DoStatement
             | Declaration
-            | ExpressionStatement
             | IfStatement
             | LocalVariableDeclaration
+            | MethodInvocation
             | ReturnStatement
             | Statement
             | SwitchStatement
             | TernaryExpression
             | ThrowStatement
             | TryStatement
-            | UpdateExpression
-            | WhileStatement => {
+            | UpdateExpression => {
+                println!("  lloc increased by {}", kind_id.to_string());
                 stats.logical_lines += 1;
             }
             For => {
@@ -475,6 +476,7 @@ impl Loc for JavaCode {
                 {
                     // handle for(int i:arr)
                     // otherwise the statements in the for are counted elsewhere
+                    println!("  lloc increased by {}", kind_id.to_string());
                     stats.logical_lines += 1;
                 }
             }
@@ -1380,6 +1382,24 @@ mod tests {
         );
     }
 
+    #[test]
+    fn java_while_lloc() {
+        check_metrics!(
+            "
+            int i=0; // +1
+            while(i < 10) { // +1
+                i++; // +1
+                System.out.println(i); // +1
+             }",
+            "foo.java",
+            JavaParser,
+            loc,
+            [
+                (lloc, 4, usize), // The number of statements is 4
+            ]
+        );
+    }
+
     #[test]
     fn java_multi_lloc() {
         check_metrics!(