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

fix sub_string and friends

Browse Source
This commit is contained in:
Vítor Santos Costa 2014-03-27 15:31:03 +00:00
parent 3b2944511e
commit 683b5989ae
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
C/atomic.c
View File

@ -736,6 +736,7 @@ p_get_string_code3( USES_REGS1 )
return FALSE; return FALSE;
} }
} else { } else {
indx -= 1;
ns = utf8_skip(s,indx); ns = utf8_skip(s,indx);
if (ns == NULL) { if (ns == NULL) {
return FALSE; return FALSE;
@ -1239,17 +1240,17 @@ build_new_atomic(int mask, wchar_t *wp, char *p, size_t min, size_t len USES_REG
return MkAtomTerm(nat); return MkAtomTerm(nat);
} else { } else {
char *src = p; char *src = p;
int i, chr;
Term t = init_tstring( PASS_REGS1 ); Term t = init_tstring( PASS_REGS1 );
for (i = 0; i < min; i++) src = utf8_get_char(src, &chr); src = (char *)utf8_skip(src, min);
char *cp = src, *buf, *lim = cp+strlen(cp); char *cp = src, *buf;
LOCAL_TERM_ERROR( 4*(len+1) ); LOCAL_TERM_ERROR( 4*(len+1) );
buf = buf_from_tstring(HR); buf = buf_from_tstring(HR);
while (cp < lim) { while (len) {
int chr; int chr;
cp = utf8_get_char(cp, &chr); cp = utf8_get_char(cp, &chr);
buf = utf8_put_char(buf, chr); buf = utf8_put_char(buf, chr);
len--;
} }
*buf++ = '\0'; *buf++ = '\0';
@ -1300,15 +1301,10 @@ check_sub_atom_at(int min, Atom at, Atom nat)
} }
static int static int
check_sub_string_at(int min, Term at, Term nat) check_sub_string_at(int min, const char *p1, const char *p2, size_t len2)
{ {
const char *p1, *p2; p1 = utf8_skip(p1, min);
int c1; return utf8_strncmp( p1, p2, len2 ) == 0;
p1 = utf8_skip(StringOfTerm(at), min);
p2 = StringOfTerm(nat);
while ( (c1 = *p1++) == *p2++ && c1);
return c1 == 0;
} }
static int static int
@ -1462,9 +1458,12 @@ cont_sub_atomic( USES_REGS1 )
} }
} }
} else { } else {
const char *p = StringOfTerm( Deref(ARG1) ), *p1 = p;
const char *p5 = StringOfTerm( Deref(ARG5) );
while (!found) { while (!found) {
p = (char *)utf8_skip(p, min); p = utf8_skip(p1, min);
if (utf8_strncmp(p, StringOfTerm(nat), len) == 0) { if (utf8_strncmp(p, p5, len) == 0) {
Yap_unify(ARG2, MkIntegerTerm(min)); Yap_unify(ARG2, MkIntegerTerm(min));
Yap_unify(ARG3, MkIntegerTerm(len)); Yap_unify(ARG3, MkIntegerTerm(len));
Yap_unify(ARG4, MkIntegerTerm(after)); Yap_unify(ARG4, MkIntegerTerm(after));
@ -1665,7 +1664,7 @@ init_sub_atomic( int sub_atom USES_REGS )
if (sub_atom) if (sub_atom)
out = check_sub_atom_at(min, at, AtomOfTerm(nat)); out = check_sub_atom_at(min, at, AtomOfTerm(nat));
else else
out = check_sub_string_at(min, tat1, tout); out = check_sub_string_at(min, p, StringOfTerm( nat ), len);
} else if ((mask & (SUB_ATOM_HAS_AFTER|SUB_ATOM_HAS_VAL)) == } else if ((mask & (SUB_ATOM_HAS_AFTER|SUB_ATOM_HAS_VAL)) ==
(SUB_ATOM_HAS_AFTER|SUB_ATOM_HAS_VAL)) { (SUB_ATOM_HAS_AFTER|SUB_ATOM_HAS_VAL)) {
if (sub_atom) if (sub_atom)