Fix minor issues in Java Grammar

Author: shubhamugare

syncode/parsers/grammars/java.lark

@@ -1,21 +1,9 @@
 start: compilation_unit 
 
-%import common.CNAME
-%import common.DIGIT
-%import common.WS
-
-%ignore WS
-
-LINE_COMMENT: /\/\/[^\n\r]*/
-BLOCK_COMMENT: /\/\*[\s\S]*?\*\//
-
 type_parameters: "<" type_parameter ("," type_parameter)* ">"
 type_parameter: CNAME type_bound?
 type_bound: "extends" type ("&" type)*
 
-%ignore LINE_COMMENT
-%ignore BLOCK_COMMENT
-
 compilation_unit: package_declaration? import_declarations? type_declarations?
 
 package_declaration: "package" name ";"
@@ -188,7 +176,7 @@ floating_point_literal: DIGIT+ "." DIGIT+
 
 boolean_literal: "true" | "false"
 
-character_literal: "'" /[^\\'\n\r]/ "'"
+character_literal: /'([^'\r\n\\]|\\([btnfr"'\\0-7]|[0-3]?[0-7]{2})|\\u[0-9a-fA-f]{4})'/
 
 string_literal: /".*?"/
 
@@ -206,8 +194,6 @@ dim_expr: "[" expression "]"
 
 dims: "[" "]"+
 
-
-
 field_access: primary "." CNAME | "super" "." CNAME
 
 method_invocation: name "(" argument_list? ")" | primary "." CNAME "(" argument_list? ")" | "super" "." CNAME "(" argument_list? ")"
@@ -289,3 +275,12 @@ reference_type: class_or_interface_type | array_type
 
 array_type: primitive_type dims | name dims | array_type dims
 
+LINE_COMMENT: /\/\/[^\n\r]*/
+BLOCK_COMMENT: /\/\*[\s\S]*?\*\//
+
+%import common.CNAME
+%import common.DIGIT
+%import common.WS
+%ignore WS
+%ignore LINE_COMMENT
+%ignore BLOCK_COMMENT

tests/parser/test_grammar_java.py

@@ -388,4 +388,8 @@ def test_java_parser26(self):
 public """
         r = inc_parser.get_acceptable_next_terminals(partial_code)
         assert AcceptSequence(['CLASS']) in r.accept_sequences
-        assert r.remainder_state == RemainderState.COMPLETE
+        assert r.remainder_state == RemainderState.COMPLETE
+
+if __name__ == '__main__':
+    unittest.main()
+