fix CHARESCAPE mess (Ulrich #292)
This commit is contained in:
parent
4160562e45
commit
8cf9e44a57
@ -345,6 +345,7 @@ Yap_InitModules(void)
|
||||
{
|
||||
CACHE_REGS
|
||||
LookupModule(MkAtomTerm(AtomProlog));
|
||||
LOCAL_SourceModule = MkAtomTerm(AtomProlog);
|
||||
LookupModule(USER_MODULE);
|
||||
LookupModule(IDB_MODULE);
|
||||
LookupModule(ATTRIBUTES_MODULE);
|
||||
|
@ -342,8 +342,6 @@ Operator types. NOTE: if you change OP_*, check operatorTypeToAtom()!
|
||||
#define OP_XFY (0x60|OP_INFIX)
|
||||
#define OP_YFX (0x70|OP_INFIX)
|
||||
|
||||
#define CHARESCAPE (0x0004) /* module */
|
||||
|
||||
/*******************************
|
||||
* COMPARE *
|
||||
*******************************/
|
||||
|
@ -77,7 +77,7 @@ typedef struct read_data_t
|
||||
#define last_token_start (_PL_rd->token_start)
|
||||
#define rb (_PL_rd->_rb)
|
||||
|
||||
#define DO_CHARESCAPE true(_PL_rd, CHARESCAPE)
|
||||
#define DO_CHARESCAPE true(_PL_rd, M_CHARESCAPE)
|
||||
|
||||
extern IOFUNCTIONS Sstringfunctions;
|
||||
|
||||
|
@ -858,7 +858,6 @@ unify_prolog_flag_value(Module m, atom_t key, prolog_flag *f, term_t val)
|
||||
{ unsigned int mask = (unsigned int)1 << (f->index-1);
|
||||
char *s;
|
||||
s=PL_atom_chars(key);
|
||||
Sprintf(GLOBAL_stderr," here it is %s\n",s);
|
||||
return PL_unify_bool_ex(val, truePrologFlag(mask) != FALSE);
|
||||
}
|
||||
/*FALLTHROUGH*/
|
||||
|
@ -441,9 +441,8 @@ raw_read_quoted(int q, ReadData _PL_rd)
|
||||
|
||||
addToBuffer(q, _PL_rd);
|
||||
while((c=getchrq()) != EOF && c != q)
|
||||
{ if ( c == '\\' && DO_CHARESCAPE )
|
||||
{ if ( c == '\\' && DO_CHARESCAPE )
|
||||
{ int base;
|
||||
|
||||
addToBuffer(c, _PL_rd);
|
||||
|
||||
switch( (c=getchrq()) )
|
||||
|
Reference in New Issue
Block a user