Minor fixes

Author: pandatix

grammar.go

@@ -264,11 +264,7 @@ func solveRep(grammar *Grammar, rep Repetition, input []byte, index, deepness in
 
 	// Return only the appropriate results.
 	outpaths := []*Path{}
-	for i := 1; i <= len(ppaths); i++ {
-		// Don't add under minimum repetition
-		if i < rep.Min {
-			continue
-		}
+	for i := max(1, rep.Min); i <= len(ppaths); i++ {
 		outpaths = append(outpaths, ppaths[i-1]...)
 	}
 	// If the empty solution if possible, keep track of it
@@ -754,19 +750,7 @@ func lexABNF(input []byte, path *Path) (any, error) {
 		}, nil
 	}
 
-	if len(path.Subpaths) == 1 && path.MatchRule == "" {
-		return lexABNF(input, path.Subpaths[0])
-	}
-
-	from := path.Start - 10
-	if from < 0 {
-		from = 0
-	}
-	to := path.End + 10
-	if to > len(input) {
-		to = len(input)
-	}
-	panic(fmt.Sprintf("unhandlable path from %d to %d: \"%s\" ; sneek peak around \"%s\"", path.Start, path.End, input[path.Start:path.End], input[from:to]))
+	panic(fmt.Sprintf("unhandlable path from %d to %d: \"%s\" ; sneek peak around \"%s\"", path.Start, path.End, input[path.Start:path.End], input[max(path.Start-10, 0):min(path.End+10, 0)]))
 }
 
 // SemvalABNF proceed to semantic validations of an ABNF grammar.

grammar_fuzz_test.go

@@ -18,10 +18,35 @@ func FuzzParseABNF(f *testing.F) {
 			if path != nil {
 				t.Fatal("Expected no path when error")
 			}
+			if err, ok := err.(*goabnf.ErrMultipleSolutionsFound); ok {
+				t.Fatalf("For input %s, got error %s", input, err)
+			}
 		} else {
 			if path == nil {
 				t.Fatal("Expected a path when no error")
 			}
 		}
 	})
 }
+
+func FuzzParseABNF_Generate(f *testing.F) {
+	f.Fuzz(func(t *testing.T, seed int64) {
+		input, _ := goabnf.ABNF.Generate(seed, "rulelist")
+
+		g, err := goabnf.ParseABNF(input, goabnf.WithValidation(false))
+
+		if err != nil {
+			if g != nil {
+				t.Fatal("Expected no path when error")
+			}
+			if err, ok := err.(*goabnf.ErrMultipleSolutionsFound); ok {
+				t.Fatalf("For input %s, got error %s", input, err)
+			}
+			return
+		} else {
+			if g == nil {
+				t.Fatal("Expected a path when no error")
+			}
+		}
+	})
+}