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

flag work

Browse Source 
boolean -> booleanFlag (win32)
This commit is contained in:
Vítor Santos Costa 2016-01-31 10:12:25 +00:00
parent d573407b4d
commit 015fbe6703
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
C/flags.c
View File

@ -29,7 +29,7 @@
static bool ro(Term inp); static bool ro(Term inp);
static bool nat(Term inp); static bool nat(Term inp);
static bool isatom(Term inp); static bool isatom(Term inp);
static bool boolean(Term inp); static bool booleanFlag(Term inp);
// static bool string( Term inp ); // static bool string( Term inp );
// static bool list_atom( Term inp ); // static bool list_atom( Term inp );
static bool list_option(Term inp); static bool list_option(Term inp);
@ -1124,7 +1124,7 @@ static bool setInitialValue(bool bootstrap, flag_func f, const char *s,
flag_term *tarr) { flag_term *tarr) {
errno = 0; errno = 0;
if (f == boolean) { if (f == booleanFlag) {
if (!bootstrap) { if (!bootstrap) {
return 0; return 0;
} }
@ -1266,7 +1266,7 @@ static bool setInitialValue(bool bootstrap, flag_func f, const char *s,
PAR("access", isaccess, PROLOG_FLAG_PROPERTY_ACCESS, "read_write"), \ PAR("access", isaccess, PROLOG_FLAG_PROPERTY_ACCESS, "read_write"), \
PAR("type", isground, PROLOG_FLAG_PROPERTY_TYPE, "term"), \ PAR("type", isground, PROLOG_FLAG_PROPERTY_TYPE, "term"), \
PAR("scope", flagscope, PROLOG_FLAG_PROPERTY_SCOPE, "global"), \ PAR("scope", flagscope, PROLOG_FLAG_PROPERTY_SCOPE, "global"), \
PAR("keep", boolean, PROLOG_FLAG_PROPERTY_KEEP, "false"), \ PAR("keep", booleanFlag, PROLOG_FLAG_PROPERTY_KEEP, "false"), \
PAR(NULL, ok, PROLOG_FLAG_PROPERTY_END, 0) PAR(NULL, ok, PROLOG_FLAG_PROPERTY_END, 0)
#define PAR(x, y, z, w) z #define PAR(x, y, z, w) z
@ -1318,7 +1318,7 @@ do_prolog_flag_property(Term tflag,
args[PROLOG_FLAG_PROPERTY_ACCESS].tvalue); args[PROLOG_FLAG_PROPERTY_ACCESS].tvalue);
break; break;
case PROLOG_FLAG_PROPERTY_TYPE: case PROLOG_FLAG_PROPERTY_TYPE:
if (fv->type == boolean) if (fv->type == booleanFlag)
rc = rc && rc = rc &&
Yap_unify(TermBoolean, args[PROLOG_FLAG_PROPERTY_TYPE].tvalue); Yap_unify(TermBoolean, args[PROLOG_FLAG_PROPERTY_TYPE].tvalue);
else if (fv->type == isatom) else if (fv->type == isatom)
@ -1480,7 +1480,7 @@ static Int do_create_prolog_flag(USES_REGS1) {
case PROLOG_FLAG_PROPERTY_TYPE: { case PROLOG_FLAG_PROPERTY_TYPE: {
Term ttype = args[PROLOG_FLAG_PROPERTY_TYPE].tvalue; Term ttype = args[PROLOG_FLAG_PROPERTY_TYPE].tvalue;
if (ttype == TermBoolean) if (ttype == TermBoolean)
fv->type = boolean; fv->type = booleanFlag;
else if (ttype == TermInteger) else if (ttype == TermInteger)
fv->type = isatom; fv->type = isatom;
else if (ttype == TermFloat) else if (ttype == TermFloat)