fix merge

ochafik · ochafik · ochafik · commit a3cbbc39c9ce · 2025-05-26T09:24:10.000-07:00
Co-Authored-By: ochafik &lt;ochafik@google.com&gt;
diff --git a/common/json-schema-to-grammar.cpp b/common/json-schema-to-grammar.cpp
@@ -723,7 +723,7 @@ class SchemaConverter {
                     break;
                 }
             }
-            auto alts = join(alternatives.begin(), alternatives.end(), " | ");
+            auto alts = string_join(alternatives, " | ");
             if (alternatives.size() > 1 || !has_required) {
                 rule += "( " + alts + (has_required ? " )" : " )?");
             } else {

Original file line number	Diff line number	Diff line change
`@@ -723,7 +723,7 @@ class SchemaConverter {`
`723`	`723`	`break;`
`724`	`724`	`}`
`725`	`725`	`}`
`726`		`- auto alts = join(alternatives.begin(), alternatives.end(), " \| ");`
	`726`	`+ auto alts = string_join(alternatives, " \| ");`
`727`	`727`	`if (alternatives.size() > 1 \|\| !has_required) {`
`728`	`728`	`rule += "( " + alts + (has_required ? " )" : " )?");`
`729`	`729`	`} else {`