diogo/yap-6.3
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

YENV may be an HW register (breaks some tabling code)

Browse Source 
All YAAM instructions are now brackedted, so Op introduced an { and EndOp introduces an }. This is because Ricardo assumes that.
Fix attvars when COROUTING is undefined.


git-svn-id: https://yap.svn.sf.net/svnroot/yap/trunk@1516 b08c6af1-5177-4d33-ba66-4b1c6b8b522a
This commit is contained in:
vsc
2006-01-17 14:10:42 +00:00
parent 92f6922f40
commit 9618c90255
14 changed files with 482 additions and 420 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
library/Tries/yap_tries.c
View File

@@ -124,7 +124,7 @@ static int p_put_trie_entry(void) {
int mode;
/* check args */
mode_str = YAP_AtomName(YAP_AtomOfTerm(arg_mode));
mode_str = (char *)YAP_AtomName(YAP_AtomOfTerm(arg_mode));
if (!strcmp(mode_str, "std")) {
mode = MODE_STANDARD;
} else if (!strcmp(mode_str, "rev")) {
@@ -152,7 +152,7 @@ static int p_get_trie_entry(void) {
int mode;
/* check args */
mode_str = YAP_AtomName(YAP_AtomOfTerm(arg_mode));
mode_str = (char *)YAP_AtomName(YAP_AtomOfTerm(arg_mode));
if (!strcmp(mode_str, "std")) {
mode = MODE_STANDARD;
} else if (!strcmp(mode_str, "rev")) {

33
library/system/sys.c
View File

@@ -8,8 +8,11 @@
* *
**************************************************************************
* *
* $Id: sys.c,v 1.24 2006-01-08 23:01:48 vsc Exp $ *
* $Id: sys.c,v 1.25 2006-01-17 14:10:42 vsc Exp $ *
* mods: $Log: not supported by cvs2svn $
* mods: Revision 1.24 2006/01/08 23:01:48 vsc
* mods: *** empty log message ***
* mods:
* mods: Revision 1.23 2005/10/21 16:09:03 vsc
* mods: SWI compatible module only operators
* mods:
@@ -227,7 +230,7 @@ list_directory(void)
YAP_Term tf = YAP_MkAtomTerm(YAP_LookupAtom("[]"));
long sl = YAP_InitSlot(tf);
char *buf = YAP_AtomName(YAP_AtomOfTerm(YAP_ARG1));
char *buf = (char *)YAP_AtomName(YAP_AtomOfTerm(YAP_ARG1));
#if defined(__MINGW32__) || _MSC_VER
struct _finddata_t c_file;
char bs[BUF_SIZE];
@@ -275,7 +278,7 @@ list_directory(void)
static int
p_unlink(void)
{
char *fd = YAP_AtomName(YAP_AtomOfTerm(YAP_ARG1));
char *fd = (char *)YAP_AtomName(YAP_AtomOfTerm(YAP_ARG1));
#if defined(__MINGW32__) || _MSC_VER
if (_unlink(fd) == -1)
#else
@@ -291,7 +294,7 @@ p_unlink(void)
static int
p_mkdir(void)
{
char *fd = YAP_AtomName(YAP_AtomOfTerm(YAP_ARG1));
char *fd = (char *)YAP_AtomName(YAP_AtomOfTerm(YAP_ARG1));
#if defined(__MINGW32__) || _MSC_VER
if (_mkdir(fd) == -1) {
#else
@@ -306,7 +309,7 @@ p_mkdir(void)
static int
p_rmdir(void)
{
char *fd = YAP_AtomName(YAP_AtomOfTerm(YAP_ARG1));
char *fd = (char *)YAP_AtomName(YAP_AtomOfTerm(YAP_ARG1));
#if defined(__MINGW32__) || _MSC_VER
if (_rmdir(fd) == -1) {
#else
@@ -321,8 +324,8 @@ p_rmdir(void)
static int
rename_file(void)
{
char *s1 = YAP_AtomName(YAP_AtomOfTerm(YAP_ARG1));
char *s2 = YAP_AtomName(YAP_AtomOfTerm(YAP_ARG2));
char *s1 = (char *)YAP_AtomName(YAP_AtomOfTerm(YAP_ARG1));
char *s2 = (char *)YAP_AtomName(YAP_AtomOfTerm(YAP_ARG2));
#if HAVE_RENAME
if (rename(s1, s2) == -1) {
/* return an error number */
@@ -345,7 +348,7 @@ file_property(void)
#if HAVE_LSTAT
struct stat buf;
fd = YAP_AtomName(YAP_AtomOfTerm(YAP_ARG1));
fd = (char *)YAP_AtomName(YAP_AtomOfTerm(YAP_ARG1));
if (lstat(fd, &buf) == -1) {
/* return an error number */
return(YAP_Unify(YAP_ARG7, YAP_MkIntTerm(errno)));
@@ -424,7 +427,7 @@ p_mktemp(void)
{
#if HAVE_MKTEMP || defined(__MINGW32__) || _MSC_VER
char *s, tmp[BUF_SIZE];
s = YAP_AtomName(YAP_AtomOfTerm(YAP_ARG1));
s = (char *)YAP_AtomName(YAP_AtomOfTerm(YAP_ARG1));
#if HAVE_STRNCPY
strncpy(tmp, s, BUF_SIZE);
#else
@@ -662,7 +665,7 @@ execute_command(void)
close(errf);
argv[0] = "sh";
argv[1] = "-c";
argv[2] = YAP_AtomName(YAP_AtomOfTerm(YAP_ARG1));
argv[2] = (char *)YAP_AtomName(YAP_AtomOfTerm(YAP_ARG1));
argv[3] = NULL;
execv("/bin/sh", argv);
exit(127);
@@ -680,7 +683,7 @@ execute_command(void)
static int
do_system(void)
{
char *command = YAP_AtomName(YAP_AtomOfTerm(YAP_ARG1));
char *command = (char *)YAP_AtomName(YAP_AtomOfTerm(YAP_ARG1));
#if HAVE_SYSTEM
int sys = system(command);
if (sys < 0) {
@@ -736,9 +739,9 @@ do_shell(void)
int t;
int sys;
cptr[0]= YAP_AtomName(YAP_AtomOfTerm(YAP_ARG1));
cptr[1]= YAP_AtomName(YAP_AtomOfTerm(YAP_ARG2));
cptr[2]= YAP_AtomName(YAP_AtomOfTerm(YAP_ARG3));
cptr[0]= (char *)YAP_AtomName(YAP_AtomOfTerm(YAP_ARG1));
cptr[1]= (char *)YAP_AtomName(YAP_AtomOfTerm(YAP_ARG2));
cptr[2]= (char *)YAP_AtomName(YAP_AtomOfTerm(YAP_ARG3));
cptr[3]= NULL;
t = fork();
if (t < 0) {
@@ -795,7 +798,7 @@ p_wait(void)
static int
p_popen(void)
{
char *command = YAP_AtomName(YAP_AtomOfTerm(YAP_ARG1));
char *command = (char *)YAP_AtomName(YAP_AtomOfTerm(YAP_ARG1));
long int mode = YAP_IntOfTerm(YAP_ARG2);
FILE *pfd;
YAP_Term tsno;

6
library/yap2swi/yap2swi.c
View File

@@ -46,7 +46,7 @@ PL_agc_hook(PL_agc_hook_t entry)
YAP: char* AtomName(Atom) */
X_API char* PL_atom_chars(atom_t a) /* SAM check type */
{
return YAP_AtomName((YAP_Atom)a);
return (char *)YAP_AtomName((YAP_Atom)a);
}
@@ -119,7 +119,7 @@ X_API int PL_get_atom_chars(term_t ts, char **a) /* SAM check type */
YAP_Term t = YAP_GetFromSlot(ts);
if (!YAP_IsAtomTerm(t))
return 0;
*a = YAP_AtomName(YAP_AtomOfTerm(t));
*a = (char *)YAP_AtomName(YAP_AtomOfTerm(t));
return 1;
}
@@ -206,7 +206,7 @@ X_API int PL_get_chars(term_t l, char **sp, unsigned flags)
if (YAP_IsAtomTerm(t)) {
if (!(flags & (CVT_ATOM|CVT_ATOMIC|CVT_ALL)))
return 0;
*sp = YAP_AtomName(YAP_AtomOfTerm(t));
*sp = (char *)YAP_AtomName(YAP_AtomOfTerm(t));
return 1;
} else if (YAP_IsIntTerm(t)) {
if (!(flags & (CVT_INTEGER|CVT_NUMBER|CVT_ATOMIC|CVT_ALL)))