mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-24 17:45:32 +00:00
Code Activity

fix #7563

Browse source
This commit is contained in:
Nikolaj Bjorner 2025-02-19 14:55:27 -08:00
parent 712231dcda
commit 01fbc0e8e7
3 changed files with 32 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
genaisrc/genaiscript.d.ts generated vendored
View file

@ -406,6 +406,11 @@ interface ModelOptions extends ModelConnectionOptions, ModelTemplateOptions {
*/
temperature?: number
/**
* Enables fallback tools mode
*/
fallbackTools?: boolean
/**
* Some reasoning model support a reasoning effort parameter.
*/
@ -3511,7 +3516,7 @@ type ImportTemplateArgumentType =
interface ChatTurnGenerationContext {
importTemplate(
files: string | string[],
files: ElementOrArray<string | WorkspaceFile>,
arguments?: Record<string, ImportTemplateArgumentType>,
options?: ImportTemplateOptions
): void
@ -4801,7 +4806,7 @@ declare function system(options: PromptSystemArgs): void
* @param arguments
*/
declare function importTemplate(
files: string | string[],
files: ElementOrArray<string | WorkspaceFile>,
arguments?: Record<string, ImportTemplateArgumentType>,
options?: ImportTemplateOptions
): void

1
genaisrc/tsconfig.json
View file

@ -16,6 +16,7 @@
"include": [
"*.mjs",
"*.mts",
"src/*.mts",
"./genaiscript.d.ts"
]
}

29
src/ast/datatype_decl_plugin.cpp
View file

@ -1239,13 +1239,32 @@ namespace datatype {
tout << "constructors: " << constructors.size() << "\n";
for (func_decl* f : constructors) tout << func_decl_ref(f, m) << "\n";
);
unsigned min_depth = INT_MAX;
for (func_decl * c : constructors) {
unsigned min_depth = UINT_MAX;
random_gen rand(ty->get_id());
unsigned start = rand();
for (unsigned cj = 0; cj < constructors.size(); ++cj) {
func_decl* c = constructors[(start + cj) % constructors.size()];
if (all_of(*c, [&](sort* s) { return !is_datatype(s); })) {
TRACE("util_bug", tout << "non_rec_constructor c: " << func_decl_ref(c, m) << "\n";);
result.first = c;
result.second = 1;
plugin().add_ast(result.first);
plugin().add_ast(ty);
plugin().m_datatype2nonrec_constructor.insert(ty, result);
return result;
}
}
for (unsigned cj = 0; cj < constructors.size(); ++cj) {
func_decl* c = constructors[(start + cj) % constructors.size()];
TRACE("util_bug", tout << "non_rec_constructor c: " << func_decl_ref(c, m) << "\n";);
unsigned num_args = c->get_arity();
unsigned i = 0;
unsigned j = 0;
unsigned max_depth = 0;
for (; i < num_args; i++) {
unsigned start2 = rand();
for (; j < num_args; j++) {
unsigned i = (start2 + j) % num_args;
verbose_stream() << i << " " << start << " " << j << " tid: " << ty->get_id() << " " << num_args << "\n";
sort * T_i = autil.get_array_range_rec(c->get_domain(i));
TRACE("util_bug", tout << "c: " << i << " " << sort_ref(T_i, m) << "\n";);
if (!is_datatype(T_i)) {
@ -1265,7 +1284,7 @@ namespace datatype {
TRACE("util_bug", tout << "nested_c: " << nested_c.first->get_name() << "\n";);
max_depth = std::max(nested_c.second + 1, max_depth);
}
if (i == num_args && max_depth < min_depth) {
if (j == num_args && max_depth < min_depth) {
result.first = c;
result.second = max_depth;
min_depth = max_depth;