refactoring

AsaiYusuke · Jan 20, 2023 · de2e4bc · de2e4bc
1 parent 0b02fd4
commit de2e4bc
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 13 deletions.
diff --git a/jsonpath_parser.go b/jsonpath_parser.go
@@ -621,17 +621,15 @@ func (p *jsonPathParser) pushCompareParameterLiteral(text interface{}) {
 }
 
 func (p *jsonPathParser) pushCompareParameterRoot(node syntaxNode) {
-	param := &syntaxQueryParamRoot{
+	p.updateAccessorMode(node, false)
+	p.push(&syntaxQueryParamRoot{
 		param: node,
-	}
-	p.updateAccessorMode(param.param, false)
-	p.push(param)
+	})
 }
 
 func (p *jsonPathParser) pushCompareParameterCurrentRoot(node syntaxNode) {
-	param := &syntaxQueryParamCurrentRoot{
+	p.updateAccessorMode(node, false)
+	p.push(&syntaxQueryParamCurrentRoot{
 		param: node,
-	}
-	p.updateAccessorMode(param.param, false)
-	p.push(param)
+	})
 }
diff --git a/syntax_query_param_current_root.go b/syntax_query_param_current_root.go
@@ -12,20 +12,19 @@ func (e *syntaxQueryParamCurrentRoot) compute(
 	root interface{}, currentList []interface{}, container *bufferContainer) []interface{} {
 
 	result := make([]interface{}, len(currentList))
+	containers := make([]bufferContainer, len(currentList))
 
 	var hasValue bool
 	for index := range currentList {
-		values := bufferContainer{}
-
-		if err := e.param.retrieve(root, currentList[index], &values); err != nil {
+		if err := e.param.retrieve(root, currentList[index], &containers[index]); err != nil {
 			result[index] = struct{}{}
 			continue
 		}
 		hasValue = true
 		if e.param.isValueGroup() {
-			result[index] = values.result
+			result[index] = containers[index].result
 		} else {
-			result[index] = values.result[0]
+			result[index] = containers[index].result[0]
 		}
 	}
 	if hasValue {