← all fixtures

c-ollama-ollama-change-imports

C View before/after files on GitHub Upstream commit ollama-ollama.git@1a19df1 llama/llama.cpp/common/json-schema-to-grammar.h
Code view:

A painting is a person's account of this edit as text, recorded independently of the node mapping - a rendering often has several equally defensible answers where the mapping has one. Deletions and insertions carry no position on the opposite side in a painting, so that panel draws no caret for them.

Before

1#pragma once
2
3#include "ggml.h"
4// Change JSON_ASSERT from assert() to GGML_ASSERT:
5#define JSON_ASSERT GGML_ASSERT
6#include "json.hpp"
7
8std::string json_schema_to_grammar(const nlohmann::ordered_json & schema,
9 bool force_gbnf = false);
10
11struct common_grammar_builder {
12 std::function<std::string(const std::string &, const std::string &)> add_rule;
13 std::function<std::string(const std::string &, const nlohmann::ordered_json &)> add_schema;
…lines 14–22 unchanged (9 lines)

After

1#pragma once
2
3#include <nlohmann/json_fwd.hpp>
4
5#include <functional>
6#include <string>
7
8std::string json_schema_to_grammar(const nlohmann::ordered_json & schema,
9 bool force_gbnf = false);
10
11struct common_grammar_builder {
12 std::function<std::string(const std::string &, const std::string &)> add_rule;
13 std::function<std::string(const std::string &, const nlohmann::ordered_json &)> add_schema;
…lines 14–22 unchanged (9 lines)

Before

translation_unit
preproc_call
preproc_directive "#pragma"
preproc_arg "once"
preproc_include
#include "#include"
string_literal
" "\""
string_content "ggml.h"
" "\""
comment "// Change JSON_ASSERT from assert() to GGML_ASSERT:"
preproc_def
#define "#define"
identifier "JSON_ASSERT"
preproc_arg "GGML_ASSERT"
preproc_include
#include "#include"
string_literal
" "\""
string_content "json.hpp"
" "\""
labeled_statement (+29 nodes collapsed)
struct_specifier (+105 nodes collapsed)
; ";"
struct_specifier
struct "struct"
type_identifier "common_grammar_options"
field_declaration_list
{ "{"
field_declaration
primitive_type "bool"
field_identifier "dotall"
ERROR
= "="
false "false"
; ";"
} "}"
; ";"
labeled_statement (+45 nodes collapsed)

After

translation_unit
preproc_call
preproc_directive "#pragma"
preproc_arg "once"
preproc_include
#include "#include"
system_lib_string "<nlohmann/json_fwd.hpp>"
preproc_include
#include "#include"
system_lib_string "<functional>"
preproc_include
#include "#include"
system_lib_string "<string>"
labeled_statement (+29 nodes collapsed)
struct_specifier (+105 nodes collapsed)
; ";"
struct_specifier
struct "struct"
type_identifier "common_grammar_options"
field_declaration_list
{ "{"
field_declaration
primitive_type "bool"
field_identifier "dotall"
ERROR
= "="
false "false"
; ";"
} "}"
; ";"
labeled_statement (+45 nodes collapsed)