mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-06 17:44:08 +00:00
Code Activity

Fixed parsing of | and \ (#6975)

Browse source 
* Give users ability to see if propagation failed

* Skip propagations in the new core if they are already satisfied

* Fix registration in final

* Don't make it too complicated...

* Fixed next_split when called in pop
Made delay_units available even without quantifiers

* Missing push calls before "decide"-callback

* Fixed parsing of | and \

* Unit-test for parsing bug
This commit is contained in:
Clemens Eisenhofer 2023-10-30 20:30:23 +01:00 committed by GitHub
parent 938a89e197
commit 996b844cde
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 74 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/parsers/smt2/smt2scanner.cpp
View file

@ -106,8 +106,13 @@ namespace smt2 {
TRACE("scanner", tout << "new quoted symbol: " << m_id << "\n";);
return SYMBOL_TOKEN;
}
escape = (c == '\\');
m_string.push_back(c);
else if (c != '|' && c != '\\' && escape) {
m_string.push_back('\\');
}
escape = (c == '\\') && !escape;
if (!escape)
m_string.push_back(c);
next();
}
}

67
src/test/smt2print_parse.cpp
View file

@ -8,6 +8,7 @@ Copyright (c) 2015 Microsoft Corporation
// for SMT-LIB2.
#include "api/z3.h"
#include "util/debug.h"
#include <iostream>
void test_print(Z3_context ctx, Z3_ast_vector av) {
@ -159,6 +160,70 @@ void test_repeated_eval() {
Z3_del_context(ctx);
}
void test_name(Z3_string spec, Z3_string expected_name) {
Z3_context ctx = Z3_mk_context(nullptr);
Z3_set_error_handler(ctx, setError);
std::cout << "spec:\n" << spec << "\n";
is_error = false;
Z3_ast_vector a =
Z3_parse_smtlib2_string(ctx,
spec,
0,
nullptr,
nullptr,
0,
nullptr,
nullptr);
std::cout << "done parsing\n";
ENSURE(is_error == (expected_name == nullptr));
if (is_error) {
Z3_del_context(ctx);
return;
}
Z3_ast_vector_inc_ref(ctx, a);
ENSURE(Z3_ast_vector_size(ctx, a) == 1)
Z3_ast c = Z3_ast_vector_get(ctx, a, 0);
Z3_inc_ref(ctx, c);
Z3_app app = Z3_to_app(ctx, c);
Z3_func_decl decl = Z3_get_app_decl(ctx, app);
Z3_symbol symbol = Z3_get_decl_name(ctx, decl);
Z3_string name = Z3_get_symbol_string(ctx, symbol);
bool success = strcmp(name, expected_name) == 0;
Z3_dec_ref(ctx, c);
Z3_ast_vector_dec_ref(ctx, a);
Z3_del_context(ctx);
ENSURE(success);
}
void test_symbol_escape() {
#define SYMBOL_ASSERTION(N) \
"(declare-const " N " Bool)\n" \
"(assert " N ")\n" \
"(check-sat)\n"
std::cout << "testing Z3_eval_smtlib2_string\n";
try {
test_name(SYMBOL_ASSERTION("|a|"), "a");
test_name(SYMBOL_ASSERTION("|a\\|"), nullptr);
test_name(SYMBOL_ASSERTION("|a\\||"), "a|");
test_name(SYMBOL_ASSERTION("|a\\\\|"), "a\\");
test_name(SYMBOL_ASSERTION("|a\\\\||"), nullptr);
test_name(SYMBOL_ASSERTION("|a\\a|"), "a\\a");
test_name(SYMBOL_ASSERTION("|a\\a"), nullptr);
}
catch(...) {
std::cout << "Error: uncaught exception\n";
throw;
}
std::cout << "done evaluating\n";
}
void tst_smt2print_parse() {
// test basic datatypes
@ -225,4 +290,6 @@ void tst_smt2print_parse() {
test_repeated_eval();
test_symbol_escape();
}