refactored dict's item access

2024-06-17 14:06:33 +02:00
parent 7e357eea62
commit b1d6b6de44
2 changed files with 24 additions and 9 deletions
@@ -87,13 +87,14 @@ func evalIndex(ctx ExprContext, self *term) (v any, err error) {
 				v = string(unboxedValue[index])
 			}
 		case *DictType:
-			var ok bool
+/* 			var ok bool
 			var indexValue any
 			if indexValue, err = verifyKey(indexTerm, indexList); err == nil {
 				if v, ok = (*unboxedValue)[indexValue]; !ok {
 					err = indexTerm.Errorf("key %v does not belong to the dictionary", rightValue)
 				}
-			}
+			} */
+			v, err = getDictItem(unboxedValue, indexTerm, indexList, rightValue)
 		default:
 			err = self.errIncompatibleTypes(leftValue, rightValue)
 		}
@@ -114,15 +115,28 @@ func evalIndex(ctx ExprContext, self *term) (v any, err error) {
 			err = self.errIncompatibleTypes(leftValue, rightValue)
 		}
 	} else if IsDict(leftValue) {
-		var ok bool
-		var indexValue any
 		d := leftValue.(*DictType)
-		if indexValue, err = verifyKey(indexTerm, indexList); err == nil {
-			if v, ok = (*d)[indexValue]; !ok {
-				err = indexTerm.Errorf("key %v does not belong to the dictionary", rightValue)
-			}
+
+		/* 		var ok bool
+		   		var indexValue any
+		   		if indexValue, err = verifyKey(indexTerm, indexList); err == nil {
+		   			if v, ok = (*d)[indexValue]; !ok {
+		   				err = indexTerm.Errorf("key %v does not belong to the dictionary", rightValue)
+		   			}
+		   		}*/
+		v, err = getDictItem(d, indexTerm, indexList, rightValue)
+	}
+	return
+}
+
+func getDictItem(d *DictType, indexTerm *term, indexList *ListType, rightValue any) (v any, err error) {
+	var ok bool
+	var indexValue any
+
+	if indexValue, err = verifyKey(indexTerm, indexList); err == nil {
+		if v, ok = (*d)[indexValue]; !ok {
+			err = indexTerm.Errorf("key %v does not belong to the dictionary", rightValue)
 		}
-	
 	}
 	return
 }