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

quasi quote

Browse Source
This commit is contained in:
Vítor Santos Costa
2013-11-25 11:23:28 +01:00
parent 3c16cd1627
commit 75737f6d56
2 changed files with 33 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
C/iopreds.c
View File

@@ -89,7 +89,6 @@ static char SccsId[] = "%W% %G%";
static Int p_set_read_error_handler( USES_REGS1 );
static Int p_get_read_error_handler( USES_REGS1 );
static Int p_read( USES_REGS1 );
static Int p_startline( USES_REGS1 );
static Int p_change_type_of_char( USES_REGS1 );
static Int p_type_of_char( USES_REGS1 );
@@ -272,6 +271,7 @@ syntax_error (TokEntry * tokptr, IOSTREAM *st, Term *outp)
Term tf[7];
Term *error = tf+3;
CELL *Hi = H;
int has_qq = FALSE;
/* make sure to globalise variable */
start = tokptr->TokPos;
@@ -300,6 +300,21 @@ syntax_error (TokEntry * tokptr, IOSTREAM *st, Term *outp)
ts[0] = Yap_MkApplTerm(Yap_MkFunctor(AtomAtom,1),1,t0);
}
break;
case QuasiQuotes_tok:
{
if (has_qq) {
Term t0[1];
t0[0] = MkAtomTerm(Yap_LookupAtom("{|"));
ts[0] = Yap_MkApplTerm(Yap_MkFunctor(AtomAtom,1),1,t0);
has_qq = FALSE;
} else {
Term t0[1];
t0[0] = MkAtomTerm(Yap_LookupAtom("|| ... |}"));
ts[0] = Yap_MkApplTerm(Yap_MkFunctor(AtomAtom,1),1,t0);
has_qq = TRUE;
}
}
break;
case Number_tok:
ts[0] = Yap_MkApplTerm(Yap_MkFunctor(AtomNumber,1),1,&(tokptr->TokInfo));
break;
@@ -458,6 +473,8 @@ p_get_read_error_handler( USES_REGS1 )
return (Yap_unify_constant (ARG1, t));
}
int
Yap_read_term(term_t t0, IOSTREAM *inp_stream, struct read_data_t *rd)
{
@@ -537,7 +554,7 @@ Yap_read_term(term_t t0, IOSTREAM *inp_stream, struct read_data_t *rd)
}
repeat_cycle:
CurrentModule = tmod;
if (LOCAL_ErrorMessage || (t = Yap_Parse()) == 0) {
if (LOCAL_ErrorMessage || (t = Yap_Parse(rd)) == 0) {
CurrentModule = OCurrentModule;
if (LOCAL_ErrorMessage) {
int res;
@@ -614,6 +631,8 @@ Yap_read_term(term_t t0, IOSTREAM *inp_stream, struct read_data_t *rd)
if (!Yap_unify(v, Yap_GetFromSlot( rd->varnames PASS_REGS)))
return FALSE;
}
if (rd->variables) {
while (TRUE) {
CELL *old_H = H;
@@ -703,8 +722,6 @@ p_force_char_conversion( USES_REGS1 )
static Int
p_disable_char_conversion( USES_REGS1 )
{
int i;
CharConversionTable = NULL;
return(TRUE);
}