sytem_library/1should fail on not finding anything
This commit is contained in:
parent
d49a7387ef
commit
b032803616
12
os/sysbits.c
12
os/sysbits.c
@ -954,16 +954,16 @@ static bool initSysPath(Term tlib, Term tcommons, bool dir_done,
|
|||||||
if ((dir = Yap_RegistryGetString("library")) && is_directory(dir)) {
|
if ((dir = Yap_RegistryGetString("library")) && is_directory(dir)) {
|
||||||
dir_done = true;
|
dir_done = true;
|
||||||
if (!Yap_unify(tlib, MkAtomTerm(Yap_LookupAtom(dir))))
|
if (!Yap_unify(tlib, MkAtomTerm(Yap_LookupAtom(dir))))
|
||||||
return FALSE;
|
return false;
|
||||||
}
|
}
|
||||||
if ((dir = Yap_RegistryGetString("prolog_commons")) && is_directory(dir)) {
|
if ((dir = Yap_RegistryGetString("prolog_commons")) && is_directory(dir)) {
|
||||||
if (!Yap_unify(tcommons, MkAtomTerm(Yap_LookupAtom(dir))))
|
if (!Yap_unify(tcommons, MkAtomTerm(Yap_LookupAtom(dir))))
|
||||||
return FALSE;
|
return false;
|
||||||
commons_done = true;
|
commons_done = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (dir_done && commons_done)
|
if (dir_done && commons_done)
|
||||||
return TRUE;
|
return true;
|
||||||
#endif
|
#endif
|
||||||
strncpy(LOCAL_FileNameBuf, YAP_SHAREDIR, YAP_FILENAME_MAX);
|
strncpy(LOCAL_FileNameBuf, YAP_SHAREDIR, YAP_FILENAME_MAX);
|
||||||
strncat(LOCAL_FileNameBuf, "/", YAP_FILENAME_MAX);
|
strncat(LOCAL_FileNameBuf, "/", YAP_FILENAME_MAX);
|
||||||
@ -972,7 +972,7 @@ static bool initSysPath(Term tlib, Term tcommons, bool dir_done,
|
|||||||
strncat(LOCAL_FileNameBuf, "Yap", YAP_FILENAME_MAX);
|
strncat(LOCAL_FileNameBuf, "Yap", YAP_FILENAME_MAX);
|
||||||
if (is_directory(LOCAL_FileNameBuf)) {
|
if (is_directory(LOCAL_FileNameBuf)) {
|
||||||
if (!Yap_unify(tlib, MkAtomTerm(Yap_LookupAtom(LOCAL_FileNameBuf))))
|
if (!Yap_unify(tlib, MkAtomTerm(Yap_LookupAtom(LOCAL_FileNameBuf))))
|
||||||
return FALSE;
|
return false;
|
||||||
dir_done = true;
|
dir_done = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -1035,15 +1035,15 @@ static bool initSysPath(Term tlib, Term tcommons, bool dir_done,
|
|||||||
if (!dir_done && is_directory(LOCAL_FileNameBuf)) {
|
if (!dir_done && is_directory(LOCAL_FileNameBuf)) {
|
||||||
if (!Yap_unify(tlib, MkAtomTerm(Yap_LookupAtom(LOCAL_FileNameBuf))))
|
if (!Yap_unify(tlib, MkAtomTerm(Yap_LookupAtom(LOCAL_FileNameBuf))))
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
dir_done = true;
|
||||||
}
|
}
|
||||||
dir_done = true;
|
|
||||||
LOCAL_FileNameBuf[len] = '\0';
|
LOCAL_FileNameBuf[len] = '\0';
|
||||||
strncat(LOCAL_FileNameBuf, "PrologCommons", YAP_FILENAME_MAX);
|
strncat(LOCAL_FileNameBuf, "PrologCommons", YAP_FILENAME_MAX);
|
||||||
if (!commons_done && is_directory(LOCAL_FileNameBuf)) {
|
if (!commons_done && is_directory(LOCAL_FileNameBuf)) {
|
||||||
if (!Yap_unify(tcommons, MkAtomTerm(Yap_LookupAtom(LOCAL_FileNameBuf))))
|
if (!Yap_unify(tcommons, MkAtomTerm(Yap_LookupAtom(LOCAL_FileNameBuf))))
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
|
||||||
commons_done = true;
|
commons_done = true;
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
return dir_done && commons_done;
|
return dir_done && commons_done;
|
||||||
}
|
}
|
||||||
|
@ -1,14 +0,0 @@
|
|||||||
"""The main routine of the yap python project."""
|
|
||||||
|
|
||||||
import sys
|
|
||||||
import yapi
|
|
||||||
|
|
||||||
|
|
||||||
def main(args=None):
|
|
||||||
"""The main routine."""
|
|
||||||
if args is None:
|
|
||||||
args = sys.argv[1:]
|
|
||||||
yap.yapi.live(args)
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
|
||||||
main()
|
|
Reference in New Issue
Block a user