Merge branch 'master' of ssh://yap.git.sourceforge.net/gitroot/yap/yap-6.3

This commit is contained in:
Tiago Gomes
2013-04-11 22:28:41 +01:00
19 changed files with 151 additions and 196 deletions

View File

@@ -523,7 +523,11 @@ readParameters (YAP_Term paramL)
Params params;
assert (YAP_IsPairTerm (paramL));
while (paramL != YAP_TermNil()) {
params.push_back ((double) YAP_FloatOfTerm (YAP_HeadOfTerm (paramL)));
YAP_Term hd = YAP_HeadOfTerm (paramL);
if (YAP_IsFloatTerm(hd))
params.push_back ((double) YAP_FloatOfTerm (hd));
else
params.push_back ((double) YAP_IntOfTerm (hd));
paramL = YAP_TailOfTerm (paramL);
}
if (Globals::logDomain) {