[Feature:Autograding] Add Java counting (#9)

* Add java

* Add tests for java

Author: poorna2152

CMakeLists.txt

@@ -17,7 +17,9 @@ add_library(tree-sitter-cpp include/tree-sitter-cpp/src/parser.c
 
 add_library(tree-sitter-c include/tree-sitter-c/src/parser.c)
 
-link_libraries(tree-sitter-python tree-sitter-c tree-sitter-cpp
+add_library(tree-sitter-java include/tree-sitter-java/src/parser.c)
+
+link_libraries(tree-sitter-python tree-sitter-c tree-sitter-cpp tree-sitter-java
                ${PROJECT_SOURCE_DIR}/include/tree-sitter/libtree-sitter.a)
 
 add_executable(submitty_count_ts src/count.cpp src/parser.cpp src/utils.cpp)

install_analysistoolsts.sh

@@ -32,7 +32,7 @@ mkdir -p "${INCLUDE_DIR}"
 ########################################################################
 
 # Clone the tree-sitter repos
-repos=( tree-sitter tree-sitter-python tree-sitter-c tree-sitter-cpp)
+repos=( tree-sitter tree-sitter-python tree-sitter-c tree-sitter-cpp tree-sitter-java)
 
 for repo in "${repos[@]}"
 do

src/count.cpp

@@ -14,14 +14,14 @@ extern "C" {
 void check_call_node(const char *type, bool &is_parent_call) {
   // types of function nodes: call, call_expression, binary_expression (eg:
   // std::cout << "hello")
-  if (!strcmp("call", type) || !strcmp("call_expression", type) || !strcmp("binary_expression", type)) {
+  if (!strcmp("call", type) || !strcmp("call_expression", type) || !strcmp("binary_expression", type) || !strcmp("method_invocation", type)) {
     is_parent_call = true;
   }
 }
 
 // check if the cur node is a function definition node
 void check_func_def_node(const char *type, bool &is_parent_func_def) {
-  if (!strcmp("function_definition", type)) {
+  if (!strcmp("function_definition", type) || !strcmp("method_declaration", type)) {
     is_parent_func_def = true;
   }
 }
@@ -61,7 +61,7 @@ int count_feature(Parser *parser, const Countable &countable, const std::string
       const char *type = ts_node_type(cur);
       // check if cur node is a identifier; used when counting
       // identifiers, functions or calls
-      if (!strcmp("identifier", type) || !strcmp("field_identifier", type)) {
+      if (!strcmp("identifier", type) || !strcmp("field_identifier", type) || !strcmp("type_identifier", type)) {
         int start = ts_node_start_byte(cur);
         int end = ts_node_end_byte(cur);
         // retrieve identifier name

src/parser.cpp

@@ -9,6 +9,7 @@ extern "C" {
 extern "C" TSLanguage *tree_sitter_python();
 extern "C" TSLanguage *tree_sitter_c();
 extern "C" TSLanguage *tree_sitter_cpp();
+extern "C" TSLanguage *tree_sitter_java();
 
 Parser::Parser(const Language &lang) {
   parser = ts_parser_new();
@@ -18,6 +19,8 @@ Parser::Parser(const Language &lang) {
     ts_parser_set_language(parser, tree_sitter_c());
   } else if (lang == CPP) {
     ts_parser_set_language(parser, tree_sitter_cpp());
+  } else if (lang == JAVA) {
+    ts_parser_set_language(parser, tree_sitter_java());
   }
 }
 
@@ -40,4 +43,4 @@ std::string Parser::get_identifier(int start, int end) {
   char const *c = cur_code.c_str();
   std::string str(c + start, c + end);
   return str;
-}
+}

src/parser.h

@@ -6,7 +6,7 @@ extern "C" {
 #include <tree_sitter/api.h>
 }
 
-enum Language { PYTHON, C, CPP };
+enum Language { PYTHON, C, CPP, JAVA };
 
 class Parser {
 public:
@@ -20,4 +20,4 @@ class Parser {
   std::string cur_code;
 };
 
-#endif
+#endif

src/utils.cpp

@@ -30,9 +30,11 @@ Language get_language(const std::string &arg) {
     return C;
   } else if (arg == "cpp" || arg == "c++") {
     return CPP;
+  } else if (arg == "java") {
+    return JAVA;
   }
   std::cerr << "Error: Invalid language" << std::endl;
-  std::cerr << "Usage: Use either py/python, c, cpp/c++" << std::endl;
+  std::cerr << "Usage: Use either py/python, c, cpp/c++, java" << std::endl;
   exit(EXIT_FAILURE);
 }
 

testSuite/commands.json

@@ -29,5 +29,23 @@
     { "-l py call dog testSuite/solution.py": 1 },
     { "-l py node class testSuite/solution.py": 1 },
     { "-l py identifier dog testSuite/solution.py": 6 }
+  ],
+  "oop.java": [
+    { "-l java node interface testSuite/oop.java": 1 },
+    { "-l java node abstract testSuite/oop.java": 1 },
+    { "-l java node extends testSuite/oop.java": 1 },
+    { "-l java function sound testSuite/oop.java": 2 },
+    { "-l java call println testSuite/oop.java": 2 },
+    { "-l java call sound testSuite/oop.java": 1 },
+    { "-l java identifier Dog testSuite/oop.java": 3 }
+  ],
+  "fibonacci.java": [
+    { "-l java node if testSuite/fibonacci.java": 1 },
+    { "-l java node for testSuite/fibonacci.java": 1 },
+    { "-l java node + testSuite/fibonacci.java": 4 },
+    { "-l java function printFibonacci testSuite/fibonacci.java": 1 },
+    { "-l java call print testSuite/fibonacci.java": 2 },
+    { "-l java identifier fibonacci testSuite/fibonacci.java": 2 },
+    { "-l java identifier Fibonacci testSuite/fibonacci.java": 4 }
   ]
 }

testSuite/fibonacci.java

@@ -0,0 +1,30 @@
+import java.io.*;
+
+class Fibonacci {
+    int count;
+
+    public Fibonacci(int count) {
+        this.count = count;
+    }
+
+    void printFibonacci() {
+        int n1 = 0, n2 = 1, n3 = 0;
+        if (count <= 0) {
+            return;
+        }
+        System.out.print(n1 + " " + n2);
+        for (int i = 2; i < count; ++i) {
+            n3 = n1 + n2;
+            System.out.print(" " + n3);
+            n1 = n2;
+            n2 = n3;
+        }
+    }
+}
+
+class Main {
+    public static void main(String args[]) {
+        Fibonacci fibonacci = new Fibonacci(10);
+        fibonacci.printFibonacci();
+    }
+}

testSuite/oop.java

@@ -0,0 +1,22 @@
+interface Animal {
+  void sound();
+}
+
+abstract class Dog implements Animal {
+  public void sound() {
+    System.out.println("Bark");
+  }
+}
+
+public class Labrador extends Dog {
+  public void labradorMethod() {
+    System.out.println("Labrador");
+  }
+}
+
+class Main {
+  public static void main(String args[]) {
+    Dog labrador = new Labrador();
+    labrador.sound();
+  }
+}