🚀 supported do-while statement

shivasurya · Nov 4, 2024 · b702236 · b702236
1 parent b1d5736
commit b702236
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 1 deletion.
diff --git a/sourcecode-parser/graph/construct.go b/sourcecode-parser/graph/construct.go
@@ -46,6 +46,7 @@ type Node struct {
 	ClassInstanceExpr    *model.ClassInstanceExpr
 	IfStmt               *model.IfStmt
 	WhileStmt            *model.WhileStmt
+	DoStmt               *model.DoStmt
 }
 
 type Edge struct {
@@ -213,7 +214,7 @@ func buildGraphFromAST(node *sitter.Node, sourceCode []byte, graph *CodeGraph, c
 		if conditionNode != nil {
 			whileNode.Condition = &model.Expr{Node: *conditionNode, NodeString: conditionNode.Content(sourceCode)}
 		}
-		methodID := fmt.Sprintf("ifstmt_%d_%d_%s", node.StartPoint().Row+1, node.StartPoint().Column+1, file)
+		methodID := fmt.Sprintf("while_stmt_%d_%d_%s", node.StartPoint().Row+1, node.StartPoint().Column+1, file)
 		// add node to graph
 		whileStmtNode := &Node{
 			ID:               GenerateSha256(methodID),
@@ -227,6 +228,27 @@ func buildGraphFromAST(node *sitter.Node, sourceCode []byte, graph *CodeGraph, c
 			WhileStmt:        &whileNode,
 		}
 		graph.AddNode(whileStmtNode)
+	case "do_statement":
+		doWhileNode := model.DoStmt{}
+		// get the condition of the while statement
+		conditionNode := node.Child(2)
+		if conditionNode != nil {
+			doWhileNode.Condition = &model.Expr{Node: *conditionNode, NodeString: conditionNode.Content(sourceCode)}
+		}
+		methodID := fmt.Sprintf("dowhile_stmt_%d_%d_%s", node.StartPoint().Row+1, node.StartPoint().Column+1, file)
+		// add node to graph
+		doWhileStmtNode := &Node{
+			ID:               GenerateSha256(methodID),
+			Type:             "DoStmt",
+			Name:             "DoStmt",
+			IsExternal:       true,
+			CodeSnippet:      node.Content(sourceCode),
+			LineNumber:       node.StartPoint().Row + 1,
+			File:             file,
+			isJavaSourceFile: isJavaSourceFile,
+			DoStmt:           &doWhileNode,
+		}
+		graph.AddNode(doWhileStmtNode)
 	case "binary_expression":
 		leftNode := node.ChildByFieldName("left")
 		rightNode := node.ChildByFieldName("right")

diff --git a/sourcecode-parser/graph/query.go b/sourcecode-parser/graph/query.go
@@ -127,6 +127,10 @@ func (env *Env) GetWhileStmt() *model.WhileStmt {
 	return env.Node.WhileStmt
 }
 
+func (env *Env) GetDoStmt() *model.DoStmt {
+	return env.Node.DoStmt
+}
+
 func QueryEntities(graph *CodeGraph, query parser.Query) (nodes [][]*Node, output [][]interface{}) {
 	result := make([][]*Node, 0)
 
@@ -300,6 +304,7 @@ func generateProxyEnv(node *Node, query parser.Query) map[string]interface{} {
 	classInstanceExpression := "ClassInstanceExpr"
 	ifStmt := "IfStmt"
 	whileStmt := "WhileStmt"
+	doStmt := "DoStmt"
 
 	// print query select list
 	for _, entity := range query.SelectList {
@@ -352,6 +357,8 @@ func generateProxyEnv(node *Node, query parser.Query) map[string]interface{} {
 			ifStmt = entity.Alias
 		case "WhileStmt":
 			whileStmt = entity.Alias
+		case "DoStmt":
+			doStmt = entity.Alias
 		}
 	}
 	env := map[string]interface{}{
@@ -490,6 +497,10 @@ func generateProxyEnv(node *Node, query parser.Query) map[string]interface{} {
 			"getWhileStmt": proxyenv.GetWhileStmt,
 			"toString":     proxyenv.ToString,
 		},
+		doStmt: map[string]interface{}{
+			"getDoStmt": proxyenv.GetDoStmt,
+			"toString":  proxyenv.ToString,
+		},
 	}
 	return env
 }

diff --git a/test-src/android/app/src/main/java/com/ivb/udacity/movieDetailActivity.java b/test-src/android/app/src/main/java/com/ivb/udacity/movieDetailActivity.java
@@ -77,6 +77,10 @@ public boolean onOptionsItemSelected(MenuItem item) {
             int i = 0;
             i++;
         }
+
+        do {
+            i++;
+        } while (i < 10);
         Cipher.getInstance("RC4")
         MessageDigest.getInstance("SHA1", "BC");
         return super.onOptionsItemSelected(item);