Remove is_universal

Signed-off-by: Matthew Hayes <matthewha853@gmail.com>

Author: mhayes853

cactus-engine/cactus_engine.h

@@ -490,7 +490,6 @@ CACTUS_FFI_EXPORT cactus_grammar_t cactus_grammar_repeat_range(
 );
 CACTUS_FFI_EXPORT int cactus_grammar_get_ebnf(cactus_grammar_t grammar, char* buffer, size_t buffer_size);
 CACTUS_FFI_EXPORT int cactus_grammar_is_empty(cactus_grammar_t grammar);
-CACTUS_FFI_EXPORT int cactus_grammar_is_universal(cactus_grammar_t grammar);
 CACTUS_FFI_EXPORT void cactus_grammar_destroy(cactus_grammar_t grammar);
 
 CACTUS_FFI_EXPORT cactus_grammar_engine_t cactus_grammar_engine_init(cactus_grammar_vocabulary_t vocabulary);

cactus-engine/src/engine.h

@@ -313,14 +313,12 @@ class Grammar {
     static Grammar repeat_range(const Grammar& grammar, int min_count, int max_count);
 
     bool is_empty() const;
-    bool is_universal() const;
     std::string ebnf() const;
 
     const xgrammar::Grammar& raw_value() const;
 
 private:
     xgrammar::Grammar grammar;
-    bool is_universal_ = false;
 };
 
 class GrammarMatcher;

cactus-engine/src/grammar.cpp

@@ -78,10 +78,10 @@ const xgrammar::TokenizerInfo& GrammarVocabulary::raw_value() const {
     return tokenizer_info;
 }
 
-Grammar::Grammar() : grammar(xgrammar::NullObj{}), is_universal_(false) {}
+Grammar::Grammar() : grammar(xgrammar::NullObj{}) {}
 
 Grammar::Grammar(xgrammar::Grammar raw_grammar)
-    : grammar(std::move(raw_grammar)), is_universal_(false) {}
+    : grammar(std::move(raw_grammar)) {}
 
 Grammar Grammar::ebnf(const std::string& ebnf, const std::string& start_symbol) {
     return Grammar(xgrammar::Grammar::FromEBNF(ebnf, start_symbol));
@@ -103,7 +103,6 @@ Grammar Grammar::universal() {
             "type": "any_text"
         }
     })");
-    grammar.is_universal_ = true;
     return grammar;
 }
 
@@ -145,7 +144,6 @@ Grammar Grammar::unite(const std::vector<Grammar>& grammars) {
     handles.reserve(grammars.size());
     for (const auto& grammar : grammars) {
         if (grammar.is_empty()) continue;
-        if (grammar.is_universal()) return grammar;
         handles.push_back(grammar.raw_value());
     }
     return handles.empty() ? Grammar() : Grammar(xgrammar::Grammar::Union(handles));
@@ -158,16 +156,17 @@ Grammar Grammar::concatenate(const std::vector<Grammar>& grammars) {
         if (grammar.is_empty()) continue;
         handles.push_back(grammar.raw_value());
     }
-    return handles.empty() ? Grammar() : Grammar(xgrammar::Grammar::Concat(handles));
+    if (handles.empty()) return Grammar();
+    return Grammar(xgrammar::Grammar::Concat(handles));
 }
 
 Grammar Grammar::optional(const Grammar& grammar) {
-    if (grammar.is_empty()) return Grammar();
+    if (grammar.is_empty()) return grammar;
     return Grammar::unite({Grammar::epsilon(), grammar});
 }
 
 Grammar Grammar::star(const Grammar& grammar) {
-    if (grammar.is_empty()) return Grammar();
+    if (grammar.is_empty()) return grammar;
 
     picojson::object structural_tag;
     structural_tag["type"] = picojson::value("structural_tag");
@@ -223,10 +222,6 @@ bool Grammar::is_empty() const {
     return grammar.IsNull();
 }
 
-bool Grammar::is_universal() const {
-    return is_universal_;
-}
-
 std::string Grammar::ebnf() const {
     if (is_empty()) {
         throw std::runtime_error("Cannot get EBNF for empty grammar");

cactus-engine/src/grammar_ffi.cpp

@@ -329,11 +329,6 @@ int cactus_grammar_is_empty(cactus_grammar_t grammar) {
     return static_cast<CactusGrammarHandle*>(grammar)->grammar->is_empty() ? 1 : 0;
 }
 
-int cactus_grammar_is_universal(cactus_grammar_t grammar) {
-    if (!grammar) return handle_int_exception(__func__, "grammar is null");
-    return static_cast<CactusGrammarHandle*>(grammar)->grammar->is_universal() ? 1 : 0;
-}
-
 void cactus_grammar_destroy(cactus_grammar_t grammar) {
     if (grammar) delete static_cast<CactusGrammarHandle*>(grammar);
 }

cactus-engine/tests/test_grammar.cpp

@@ -246,12 +246,6 @@ static bool test_empty_grammar_properties() {
         return false;
     }
 
-    if (cactus_grammar_is_universal(empty.get())
-        || cactus_grammar_is_universal(empty2.get())
-        || cactus_grammar_is_universal(simple.get())) {
-        return false;
-    }
-
     cactus_grammar_t empty_union_inputs[] = {empty.get(), empty2.get()};
     auto empty_union = GrammarHandle(make_grammar_handle(cactus_grammar_union(empty_union_inputs, 2)), &cactus_grammar_destroy);
     auto empty_concat = GrammarHandle(make_grammar_handle(cactus_grammar_concatenate(empty_union_inputs, 2)), &cactus_grammar_destroy);
@@ -414,20 +408,11 @@ static bool test_regex_and_json_schema_construction() {
 
 static bool test_universal_grammar_accepts_anything(const GrammarFixture& fixture) {
     auto grammar = GrammarHandle(make_grammar_universal(), &cactus_grammar_destroy);
-    return cactus_grammar_is_universal(grammar.get())
-        && accepts_complete_text(grammar.get(), fixture, "")
+    return accepts_complete_text(grammar.get(), fixture, "")
         && accepts_complete_text(grammar.get(), fixture, "blob says hello from cactus")
         && accepts_complete_text(grammar.get(), fixture, "line one\nline two\nline three");
 }
 
-static bool test_union_with_universal_returns_universal() {
-    auto universal = GrammarHandle(make_grammar_universal(), &cactus_grammar_destroy);
-    auto specific = GrammarHandle(make_grammar_ebnf("root ::= \"hello\""), &cactus_grammar_destroy);
-    cactus_grammar_t handles[] = {specific.get(), universal.get()};
-    auto combined = GrammarHandle(make_grammar_handle(cactus_grammar_union(handles, 2)), &cactus_grammar_destroy);
-    return cactus_grammar_is_universal(combined.get());
-}
-
 static bool test_structural_tag_accepts_and_rejects_expected_text(const GrammarFixture& fixture) {
     auto grammar = GrammarHandle(make_grammar_structural_tag(tool_call_structural_tag_json(), fixture.vocab.get()), &cactus_grammar_destroy);
     auto matcher = GrammarMatcherHandle(make_matcher(grammar.get(), fixture.engine.get()), &cactus_grammar_matcher_destroy);
@@ -610,7 +595,6 @@ int main() {
         runner.run_test("regex_language", test_regex_accepts_expected_text(fixture));
         runner.run_test("json_schema_language", test_json_schema_accepts_expected_text(fixture));
         runner.run_test("universal", test_universal_grammar_accepts_anything(fixture));
-        runner.run_test("union_with_universal_returns_universal", test_union_with_universal_returns_universal());
         runner.run_test("structural_tag_language", test_structural_tag_accepts_and_rejects_expected_text(fixture));
         runner.run_test("grammar_matcher_reset", test_grammar_matcher_reset_restores_initial_state(fixture));
         runner.run_test("grammar_matcher_rollback", test_grammar_matcher_rollback_restores_previous_state(fixture));