M discord_programmieraufgaben/2025-10-11_1/rechner.go → discord_programmieraufgaben/2025-10-11_1/rechner.go

@@ -23,31 +23,38 @@
 func parseCalculation(calculation *string) *int64 {
 	for i := 0; i < len(*calculation); i++ { // no range because unicode would be wasteful
 		if (*calculation)[i] == '+' {
-			return add(&i, calculation)
+			left, err := strconv.ParseInt((*calculation)[:i], 10, 64)
+			if err != nil {
+				log.Fatal(err)
+			}
+			right, err := strconv.ParseInt((*calculation)[i+1:], 10, 64)
+			if err != nil {
+				log.Fatal(err)
+			}
+
+			switch (*calculation)[i] {
+			case '+':
+				return add(&left, &right)
+			default:
+				log.Fatal("Unbekanntes Rechenzeichen")
+			}
+
+
 		}
 	}
 	singleNumber, err := strconv.ParseInt(*calculation, 10, 64)
 	if err != nil {
-		log.Fatal("Unbekanntes Rechenzeichen")
+		log.Fatal("Invalide Zahl")
 	}
 
 	return &singleNumber
 }
 
-func add(i *int, calculation *string) *int64 {
-	left, err := strconv.ParseInt((*calculation)[:*i], 10, 64)
-	if err != nil {
-		log.Fatal(err)
-	}
-	right, err := strconv.ParseInt((*calculation)[*i+1:], 10, 64)
-	if err != nil {
-		log.Fatal(err)
-	}
+func add(left *int64, right *int64) *int64 {
 
-	result := left + right
+	result := *left + *right
 
 	return &result
-	
 }
 
 func main() {