Skip to content

prevent FMB crashes on FOOLish inputs #724

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MichaelRawson wants to merge 1 commit into
base: master
Choose a base branch
from
Open

prevent FMB crashes on FOOLish inputs #724

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 2 additions & 8 deletions FMB/FiniteModelMultiSorted.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,6 @@ void FiniteModelMultiSorted::initTables()

sortRepr.ensure(env.signature->typeCons());
for(unsigned s=0;s<env.signature->typeCons();s++){
if(env.signature->isInterpretedNonDefault(s))
continue;
sortRepr[s].ensure(_sizes[s]+1);
for(unsigned i=0;i<=_sizes[s];i++){
sortRepr[s][i] = -1;
Expand Down Expand Up @@ -156,15 +154,11 @@ std::string FiniteModelMultiSorted::toString()
unsigned size = _sizes[s];
if(size==0) continue;

// don't output interpreted sorts at all, we know what they are
if(env.signature->isInterpretedNonDefault(s))
continue;

std::string sortName = env.signature->typeConName(s);
std::string sortNameLabel = (env.signature->isBoolCon(s)) ? "bool" : sortName;

// skip declaring $i, we know what it is
if(!env.signature->isDefaultSortCon(s))
// skip declaring $i and interpreted sorts, we know what they are
if(!env.signature->isDefaultSortCon(s) && !env.signature->isInterpretedNonDefault(s))
// Sort declaration
modelStm << "tff(" << prepend("declare_", sortNameLabel) << ",type,"<<sortName<<":$tType)." <<endl;

Expand Down
2 changes: 2 additions & 0 deletions FMB/SortInference.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@ void SortInference::doInference()
unsigned fresh = env.signature->addFreshFunction(0,"fmbFreshConstant");
TermList sT = TermList(AtomicSort::createConstant(s));
env.signature->getFunction(fresh)->setType(OperatorType::getConstantsType(sT));
env.signature->getFunction(fresh)->markIntroduced();
_sig->sortedConstants[dsort].push(fresh);
}
}
Expand Down Expand Up @@ -498,6 +499,7 @@ void SortInference::doInference()
#endif
if(_sig->sortedConstants[s].size()==0 && _sig->sortedFunctions[s].size()>0){
unsigned fresh = env.signature->addFreshFunction(0,"fmbFreshConstant");
env.signature->getFunction(fresh)->markIntroduced();
_sig->sortedConstants[s].push(fresh);
freshMap.insert(fresh,s);
if(firstFreshConstant==UINT_MAX) firstFreshConstant=fresh;
Expand Down
2 changes: 2 additions & 0 deletions Kernel/Signature.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -836,8 +836,10 @@ class Signature
if(!_foolConstantsDefined){
_foolFalse = addFunction("$$false",0);
getFunction(_foolFalse)->setType(OperatorType::getConstantsType(AtomicSort::boolSort()));
getFunction(_foolFalse)->markIntroduced();
_foolTrue = addFunction("$$true",0);
getFunction(_foolTrue)->setType(OperatorType::getConstantsType(AtomicSort::boolSort()));
getFunction(_foolTrue)->markIntroduced();
_foolConstantsDefined=true;
}
return isTrue ? _foolTrue : _foolFalse;
Expand Down