grammars: x{min,max} repetition operator#6640

Merged

ochafik merged 36 commits intoggml-org:masterfrom

ochafik:grammar-reps

Jun 6, 2024

Commits on Apr 12, 2024

grammars: x{min,max} repetition operator + tweak +/*/? to avoid duplication of original over alternates
Olivier Chafik
committed
grammars: handle `x{n}` and fix `x{n,n}`
Olivier Chafik
committed
grammars: document new repetition operators
Olivier Chafik
committed
grammars: nit
Olivier Chafik
committed
grammars: uniform use of int for min & max
Olivier Chafik
committed
grammars: refactor parser test
Olivier Chafik
committed
grammar: parsing tests w/ natural pretty print of updated expectations
Olivier Chafik
committed
grammars: much prettier print of expectations (+ TEST_GRAMMAR_PARSER_PRINT_ALL=1 to force all)
Olivier Chafik
committed
grammars: improve test pretty print again
Olivier Chafik
committed
grammars: pretty print rules and chars
Olivier Chafik
committed
grammars: fix copy rule skipping
Olivier Chafik
committed
grammars: disallow `a{,}` (not allowed in regexps)
Olivier Chafik
committed
Update common/grammar-parser.cpp

ochafik
and
HanClinto
authored
grammars: fix copy rule skipping (again) & display of expectations
Olivier Chafik
committed
grammars: more test cases
Olivier Chafik
committed

Commits on Apr 15, 2024

Merge remote-tracking branch 'origin/master' into grammar-reps
ochafik
committed

Commits on Apr 19, 2024

grammars: update reps parsing to bring ? / * / + closer to before
ochafik
committed

Commits on Apr 20, 2024

json: use new GBNF repetitions{m,n} syntax
ochafik
committed
grammars: update performance gotchas w/ repetition advice
ochafik
committed

Commits on Apr 21, 2024

Merge remote-tracking branch 'origin/master' into grammar-reps
ochafik
committed

Commits on Apr 24, 2024

Update examples/json_schema_to_grammar.py

ochafik
and
HanClinto
authored
Update examples/server/public/json-schema-to-grammar.mjs

ochafik
and
HanClinto
authored
grammars: comment on rule repetitions
Olivier Chafik
committed
grammars: ensure unambiguous number alternatives
Olivier Chafik
committed
grammar: nit typo switched error msgs
Olivier Chafik
committed
grammar: nit numbering in comment
Olivier Chafik
committed
json: update numeric rule to be unambiguous
Olivier Chafik
committed
Apply suggestions from code review

ochafik
and
HanClinto
authored
Update examples/server/public/json-schema-to-grammar.mjs

ochafik
and
HanClinto
authored
json: fix integral-part
Olivier Chafik
committed
Merge branch 'grammar-reps' of https://github.com/ochafik/llama.cpp into grammar-reps
Olivier Chafik
committed

Commits on Apr 30, 2024

Merge remote-tracking branch 'origin/master' into grammar-reps
ochafik
committed
grammar: add repetition tests
ochafik
committed

Commits on May 18, 2024

Merge remote-tracking branch 'origin/master' into grammar-reps
ochafik
committed

Commits on May 21, 2024

Merge remote-tracking branch 'origin/master' into grammar-reps
ochafik
committed

Commits on Jun 4, 2024

Merge remote-tracking branch 'origin/master' into grammar-reps
ochafik
committed