Operator impl and assertions

Author: dburriss

src/getter.rs

@@ -549,6 +549,7 @@ impl Getter for JavaCode {
         // Operand: vars and const
 
         let typ = node.object().kind_id();
+
         match typ.into() {
             // LPAREN | COMMA | STAR | GTGT | COLON | SEMI | Return | Break | Continue | If | Else
             // | Switch | Case | Default | For | While | New | Try | Catch | Throw | Throws
@@ -560,18 +561,32 @@ impl Getter for JavaCode {
             // Operator: control flow
             | If | Else | Switch | Case | Try | Catch | Throw | Throws | Throws2 | For | While | Continue | Break | Do | Finally
             // Operator: keywords
-            | New | Return | Default | Abstract | Assert | Instanceof | Extends | Final | Implements | Transient | Synchronized | Super | This
+            | New | Return | Default | Abstract | Assert | Instanceof | Extends | Final | Implements | Transient | Synchronized | Super | This | VoidType
             // Operator: brackets and comma and terminators (separators)
             | SEMI | COMMA | COLONCOLON | LBRACE | LBRACK | LPAREN | RBRACE | RBRACK | RPAREN | DOTDOTDOT | DOT
             // Operator: operators
             | EQ | LT | GT | BANG | TILDE | QMARK | COLON // no grammar for lambda operator ->
             | EQEQ | LTEQ | GTEQ | BANGEQ | AMPAMP | PIPEPIPE | PLUSPLUS | DASHDASH
             | PLUS | DASH | STAR | SLASH | AMP | PIPE | CARET | PERCENT| LTLT | GTGT | GTGTGT
             | PLUSEQ | DASHEQ | STAREQ | SLASHEQ | AMPEQ | PIPEEQ | CARETEQ | PERCENTEQ | LTLTEQ | GTGTEQ | GTGTGTEQ
-            => HalsteadType::Operator,
+            // type identifier
+            | TypeIdentifier 
+            // Literals
+            | IntegralType | FloatingPointType | BooleanType | NullLiteral
+            => {
+                println!("operator: {}", node.object().kind().to_string());
+                HalsteadType::Operator
+            },
+
             // variables, constants
-            Identifier | Literal  => HalsteadType::Operand,
-            _ => HalsteadType::Unknown,
+            Identifier | Literal  => {
+                println!("operand: {} ", node.object().kind().to_string());
+                HalsteadType::Operand
+            },
+            _ => {
+                println!("unknown: {} ", node.object().kind().to_string());
+                HalsteadType::Unknown
+            },
         }
     }
 

src/metrics/halstead.rs

@@ -540,10 +540,10 @@ mod tests {
             JavaParser,
             halstead,
             [
-                (u_operators, 10, usize), // function, (), {}, var, =, +, /, ,, ., ;
-                                          // (operators, 24, usize),
-                                          // (u_operands, 11, usize), // main, a, b, c, avg, 3, 5, console.log, console, log, "{}"
-                                          // (operands, 21, usize)
+                (u_operators, 16, usize), // void ; ( String [ ] ) { , int = + / format . }
+                (operators, 33, usize),
+                (u_operands, 11, usize), // main, a, b, c, avg, 3, 5, MessageFormat.format, format, "{}"
+                (operands, 21, usize)
             ]
         );
     }