lix-project/lix
20
57
Fork 31
Code Issues 347 Code Review (Gerrit) Projects 3 Releases Wiki Activity

* Bug fix: slices are transitive, so if we detect that an

Browse source 
input path is referenced in an output paths, we also have to 
  add all ids referenced by that input path.
* Better debug assertions to catch these sorts of errors.
This commit is contained in:
Eelco Dolstra 2003-07-16 20:33:29 +00:00
parent 9d56ca219f
commit 6822fd7bf4
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/fstate.cc
View file

@ -217,6 +217,9 @@ static void parseIds(ATermList ids, FSIds & out)
} }
static void checkSlice(const Slice & slice);
/* Parse a slice. */ /* Parse a slice. */
static Slice parseSlice(FState fs) static Slice parseSlice(FState fs)
{ {
@ -242,6 +245,8 @@ static Slice parseSlice(FState fs)
elems = ATgetNext(elems); elems = ATgetNext(elems);
} }
checkSlice(slice);
return slice; return slice;
} }
@ -414,6 +419,9 @@ static Slice normaliseFState2(FSId id, StringSet & usedPaths)
if ((k = inMap.find(*j)) != inMap.end()) { if ((k = inMap.find(*j)) != inMap.end()) {
elem.refs.push_back(k->second.id); elem.refs.push_back(k->second.id);
used.insert(k->second.id); used.insert(k->second.id);
for (FSIds::iterator m = k->second.refs.begin();
m != k->second.refs.end(); m++)
used.insert(*m);
} else if ((l = outPaths.find(*j)) != outPaths.end()) { } else if ((l = outPaths.find(*j)) != outPaths.end()) {
elem.refs.push_back(l->second); elem.refs.push_back(l->second);
used.insert(l->second); used.insert(l->second);
@ -441,6 +449,8 @@ static Slice normaliseFState2(FSId id, StringSet & usedPaths)
storeSuccessor(id, nf, &fsPath); storeSuccessor(id, nf, &fsPath);
usedPaths.insert(fsPath); usedPaths.insert(fsPath);
parseSlice(nf); /* check */
return slice; return slice;
} }
@ -460,10 +470,7 @@ static void checkSlice(const Slice & slice)
FSIdSet decl; FSIdSet decl;
for (SliceElems::const_iterator i = slice.elems.begin(); for (SliceElems::const_iterator i = slice.elems.begin();
i != slice.elems.end(); i++) i != slice.elems.end(); i++)
{
debug((string) i->id);
decl.insert(i->id); decl.insert(i->id);
}
for (FSIds::const_iterator i = slice.roots.begin(); for (FSIds::const_iterator i = slice.roots.begin();
i != slice.roots.end(); i++) i != slice.roots.end(); i++)
@ -484,8 +491,6 @@ void realiseSlice(const Slice & slice)
debug(format("realising slice")); debug(format("realising slice"));
Nest nest(true); Nest nest(true);
checkSlice(slice);
/* Perhaps all paths already contain the right id? */ /* Perhaps all paths already contain the right id? */
bool missing = false; bool missing = false;