jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Finished testing insert, seek

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@123 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Dustin Mitchell 2000-01-19 20:49:55 +00:00
commit 0e6dd6d138
1 changed files with 98 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

133
Source/Swig/super.c
View file

@ -74,7 +74,7 @@ static int Super_delitem(DOH *s, int where);
static DOH *Super_str(DOH *s); static DOH *Super_str(DOH *s);
static int Super_read(DOH *s, void *buffer, int length); static int Super_read(DOH *s, void *buffer, int length);
static int Super_write(DOH *s, void *buffer, int length); static int Super_write(DOH *s, void *buffer, int length);
static int Super_seek(DOH *s, long offset, int whence); static int Super_seek(DOH *s, long offset, int whence);
static long Super_tell(DOH *s); static long Super_tell(DOH *s);
static int Super_putc(DOH *s, int ch); static int Super_putc(DOH *s, int ch);
static int Super_getc(DOH *s); static int Super_getc(DOH *s);
@ -593,7 +593,7 @@ Super_seek(DOH *so, long offset, int whence)
Super *s = (Super *) so; Super *s = (Super *) so;
s->pbi = 0; s->pbi = 0;
if (whence == SEEK_SET) offset = -s->sp; if (whence == SEEK_SET) offset = offset - s->sp;
else if (whence == SEEK_END) offset = s->len - s->sp - offset; else if (whence == SEEK_END) offset = s->len - s->sp - offset;
if (offset + s->sp < 0) if (offset + s->sp < 0)
@ -793,29 +793,77 @@ Super_move(Super *s, int delta)
int curtag_offset = s->curtag_offset; int curtag_offset = s->curtag_offset;
int line = s->line; int line = s->line;
if (delta > s->len - s->sp) if (s->sp + delta > s->len)
delta = s->len - s->sp; delta = s->len - s->sp;
else if (s->sp + delta < 0)
delta = - s->sp;
while (1) if (delta > 0)
{ {
int remaining = s->tags[s->curtag].length - curtag_offset; while (1)
if (delta >= remaining)
{ {
delta -= remaining; int remaining = s->tags[s->curtag].length - curtag_offset;
s->sp += remaining;
s->curtag++; if (delta >= remaining)
line = s->tags[s->curtag].line; {
curtag_offset = 0; delta -= remaining;
s->sp += remaining;
s->curtag++;
line = s->tags[s->curtag].line;
curtag_offset = 0;
}
else
{
line += Super_count_newlines(s->str + s->sp, delta);
curtag_offset += delta;
s->sp += delta;
break;
}
}
}
else
{
delta = -delta;
if (delta < curtag_offset)
{
/* short-circuit if we won't cross a tag boundary */
curtag_offset -= delta;
s->sp -= delta;
line -= Super_count_newlines(s->str + s->sp, delta);
} }
else else
{ while (1)
line += Super_count_newlines(s->str + s->sp, delta); {
curtag_offset += delta; int remaining = curtag_offset;
s->sp += delta;
if (delta > remaining)
{
delta -= remaining;
s->sp -= remaining;
s->curtag--;
curtag_offset = s->tags[s->curtag].length;
}
else if (delta == remaining)
{
s->sp -= delta;
curtag_offset = 0;
line = s->tags[s->curtag].line;
break; break;
} }
else
{
curtag_offset -= delta;
s->sp -= delta;
line = s->tags[s->curtag].line +
Super_count_newlines(s->str + s->sp - curtag_offset,
curtag_offset);
break;
}
}
} }
s->curtag_offset = curtag_offset; s->curtag_offset = curtag_offset;
@ -833,6 +881,13 @@ Super_get_tag(Super *s, int pos, int *offset)
int tag = 0; int tag = 0;
SSTag *tags = s->tags; SSTag *tags = s->tags;
if (pos == s->len) /* special case */
{
int lasttag = s->numtags - 1;
if (offset) *offset = s->tags[lasttag].length;
return lasttag;
}
while (pos >= tags->length) while (pos >= tags->length)
{ {
pos -= tags->length; pos -= tags->length;
@ -931,6 +986,8 @@ Super_string_insert(Super *s, int pos, char *str, int len,
if (pos < 0) pos = 0; if (pos < 0) pos = 0;
else if (pos > s->len) pos = s->len; else if (pos > s->len) pos = s->len;
tag = Super_get_tag(s, pos, &offset);
/* do the insertion */ /* do the insertion */
Super_add_space(s, len); Super_add_space(s, len);
if (pos < s->len) if (pos < s->len)
@ -940,7 +997,6 @@ Super_string_insert(Super *s, int pos, char *str, int len,
s->str[s->len] = 0; s->str[s->len] = 0;
/* insert new tags for this string if necessary */ /* insert new tags for this string if necessary */
tag = Super_get_tag(s, pos, &offset);
if (filename) if (filename)
{ {
int left_len = offset; int left_len = offset;
@ -1025,6 +1081,8 @@ Super_super_insert(Super *s, int pos, Super *str)
len = str->len; len = str->len;
if (len == 0) return; if (len == 0) return;
tag = Super_get_tag(s, pos, &offset);
/* do the insertion */ /* do the insertion */
Super_add_space(s, len); Super_add_space(s, len);
if (pos < s->len) if (pos < s->len)
@ -1034,7 +1092,6 @@ Super_super_insert(Super *s, int pos, Super *str)
s->str[s->len] = 0; s->str[s->len] = 0;
/* collect some factoids about the new layout of the tags */ /* collect some factoids about the new layout of the tags */
tag = Super_get_tag(s, pos, &offset);
left_len = offset; left_len = offset;
right_len = s->tags[tag].length - offset; right_len = s->tags[tag].length - offset;
right_filename = s->tags[tag].filename; right_filename = s->tags[tag].filename;
@ -1055,7 +1112,6 @@ Super_super_insert(Super *s, int pos, Super *str)
{ {
new_tags--; new_tags--;
Delete(s->tags[tag].filename); Delete(s->tags[tag].filename);
tag--; /* back up so we overwrite it. */
} }
if (right_len == 0) if (right_len == 0)
new_tags--; new_tags--;
@ -1067,6 +1123,10 @@ Super_super_insert(Super *s, int pos, Super *str)
s->tags = (SSTag *)DohRealloc(s->tags, s->maxtags * sizeof(SSTag)); s->tags = (SSTag *)DohRealloc(s->tags, s->maxtags * sizeof(SSTag));
assert(s->tags); assert(s->tags);
} }
/* and move the existing tags forward. */
memmove(s->tags + tag + new_tags, s->tags + tag,
(s->numtags - tag) * sizeof(SSTag));
/* and start writing in the data */ /* and start writing in the data */
if (left_len) if (left_len)
@ -1335,12 +1395,11 @@ Super_raw_replace(Super *str, char *token, int flags,
#ifdef SUPER_TEST #ifdef SUPER_TEST
#include <stdio.h> #include <stdio.h>
static void annotate(DOH *hyd) static void annotate(DOH *hyd, int pos)
{ {
int len, i; int len, i;
len = Len(hyd); len = Len(hyd);
Seek(hyd, SEEK_SET, 0); for (i = pos; i < len; i++)
for (i = 0; i < len; i++)
{ {
DOH *file; DOH *file;
int line; int line;
@ -1348,12 +1407,17 @@ static void annotate(DOH *hyd)
char d; char d;
int pos; int pos;
if (i % 2)
Seek(hyd, 0, SEEK_SET);
else
Seek(hyd, 0, SEEK_END);
Seek(hyd, i, SEEK_SET);
file = Getfile(hyd); file = Getfile(hyd);
line = Getline(hyd); line = Getline(hyd);
pos = Tell(hyd); pos = Tell(hyd);
c[0] = Getc(hyd); c[0] = Getc(hyd);
d = Getc(hyd);
Ungetc(d, hyd);
if (c[0] < ' ') if (c[0] < ' ')
{ {
c[2] = 0; c[2] = 0;
@ -1369,15 +1433,14 @@ static void annotate(DOH *hyd)
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
DOH *g = NewSuper("Hello\ncruel\nworld\nas", "hey", 100); DOH *abcd = NewSuper("AB\nCD", "abcd", 20);
DOH *b = NewSuper("namaste\nadios\nseeya!\nas", "bye", 20); DOH *ijkl = NewSuper("IJ\nKL\nMN", "ijkl", 30);
DOH *hyd = NewSuper("so,\nhow\nare\nyou\ndoing?\nad", "hyd", 200);
DOH *str = NewString("####\n####");
Setfile(str, "str");
Setline(str, 10000);
Insert(hyd, 23, b); Insert(ijkl, 6, abcd);
annotate(hyd); Insert(ijkl, 5, abcd);
return Len(hyd); Seek(ijkl, atoi(argv[1]), SEEK_SET);
annotate(ijkl, atoi(argv[2]));
return 0;
} }
#endif #endif