xaptronic
diff --git a/‎Makefile
Copy file name to clipboardExpand all lines: Makefile
+1-1Lines changed: 1 addition & 1 deletion b/‎Makefile
Copy file name to clipboardExpand all lines: Makefile
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎llama.cpp
Copy file name to clipboardExpand all lines: llama.cpp
+19Lines changed: 19 additions & 0 deletions b/‎llama.cpp
Copy file name to clipboardExpand all lines: llama.cpp
+19Lines changed: 19 additions & 0 deletions
diff --git a/‎llama.h
Copy file name to clipboardExpand all lines: llama.h
+1Lines changed: 1 addition & 0 deletions b/‎llama.h
Copy file name to clipboardExpand all lines: llama.h
+1Lines changed: 1 addition & 0 deletions
@@ -257,7 +257,7 @@ common.o: examples/common.cpp examples/common.h
 grammar-parser.o: examples/grammar-parser.cpp examples/grammar-parser.h
 	$(CXX) $(CXXFLAGS) -c $< -o $@
 
-libllama.so: llama.o ggml.o $(OBJS)
+libllama.so: llama.o ggml.o grammar-parser.o $(OBJS)
 	$(CXX) $(CXXFLAGS) -shared -fPIC -o $@ $^ $(LDFLAGS)
 
 clean:
 
@@ -8,6 +8,7 @@
 
 #include "llama-util.h"
 #include "llama.h"
+#include "grammar-parser.h"
 
 #include "ggml.h"
 #ifdef GGML_USE_CUBLAS
@@ -1998,6 +1999,24 @@ void llama_grammar_free(struct llama_grammar * grammar) {
     delete grammar;
 }
 
+struct llama_grammar * llama_parse_grammar(const char * grammar_str) {
+    grammar_parser::parse_state parsed_grammar;
+    llama_grammar *             grammar = NULL;
+    if (grammar_str != NULL) {
+        parsed_grammar = grammar_parser::parse(grammar_str);
+        // will be empty (default) if there are parse errors
+        if (parsed_grammar.out_grammar.empty()) {
+            return NULL;
+        }
+        fprintf(stderr, "%s: grammar:\n", __func__);
+        grammar_parser::print_grammar(stderr, parsed_grammar);
+        fprintf(stderr, "\n");
+        grammar = llama_grammar_init(
+            parsed_grammar.out_grammar.data(), parsed_grammar.symbol_ids.at("root"));
+    }
+    return grammar;
+}
+
 //
 // sampling
 //
 
@@ -264,6 +264,7 @@ extern "C" {
     //
     LLAMA_API struct llama_grammar * llama_grammar_init(const uint16_t * src, uint16_t start_rule_id);
     LLAMA_API void llama_grammar_free(struct llama_grammar * grammar);
+    LLAMA_API struct llama_grammar * llama_parse_grammar(const char * grammar_str);
 
     // Sampling functions