version 1.99, 2009/09/16 09:41:24 |
version 1.100, 2009/09/16 15:08:31 |
Line 39 static void do_reserved(struct termp *, |
|
Line 39 static void do_reserved(struct termp *, |
|
const char *, size_t); |
const char *, size_t); |
static void buffer(struct termp *, char); |
static void buffer(struct termp *, char); |
static void encode(struct termp *, char); |
static void encode(struct termp *, char); |
static int isopendelim(const char *); |
|
static int isclosedelim(const char *); |
|
|
|
|
|
void * |
void * |
Line 112 term_alloc(enum termenc enc) |
|
Line 110 term_alloc(enum termenc enc) |
|
} |
} |
|
|
|
|
static int |
|
isclosedelim(const char *p) |
|
{ |
|
|
|
if ( ! (*p && 0 == *(p + 1))) |
|
return(0); |
|
|
|
switch (*p) { |
|
case('.'): |
|
/* FALLTHROUGH */ |
|
case(','): |
|
/* FALLTHROUGH */ |
|
case(';'): |
|
/* FALLTHROUGH */ |
|
case(':'): |
|
/* FALLTHROUGH */ |
|
case('?'): |
|
/* FALLTHROUGH */ |
|
case('!'): |
|
/* FALLTHROUGH */ |
|
case(')'): |
|
/* FALLTHROUGH */ |
|
case(']'): |
|
/* FALLTHROUGH */ |
|
case('}'): |
|
return(1); |
|
default: |
|
break; |
|
} |
|
|
|
return(0); |
|
} |
|
|
|
|
|
static int |
|
isopendelim(const char *p) |
|
{ |
|
|
|
if ( ! (*p && 0 == *(p + 1))) |
|
return(0); |
|
|
|
switch (*p) { |
|
case('('): |
|
/* FALLTHROUGH */ |
|
case('['): |
|
/* FALLTHROUGH */ |
|
case('{'): |
|
return(1); |
|
default: |
|
break; |
|
} |
|
|
|
return(0); |
|
} |
|
|
|
|
|
/* |
/* |
* Flush a line of text. A "line" is loosely defined as being something |
* Flush a line of text. A "line" is loosely defined as being something |
* that should be followed by a newline, regardless of whether it's |
* that should be followed by a newline, regardless of whether it's |
Line 542 term_word(struct termp *p, const char *word) |
|
Line 484 term_word(struct termp *p, const char *word) |
|
{ |
{ |
const char *sv; |
const char *sv; |
|
|
if (isclosedelim(word)) |
sv = word; |
if ( ! (TERMP_IGNDELIM & p->flags)) |
|
p->flags |= TERMP_NOSPACE; |
|
|
|
|
if (word[0] && 0 == word[1]) |
|
switch (word[0]) { |
|
case('.'): |
|
/* FALLTHROUGH */ |
|
case(','): |
|
/* FALLTHROUGH */ |
|
case(';'): |
|
/* FALLTHROUGH */ |
|
case(':'): |
|
/* FALLTHROUGH */ |
|
case('?'): |
|
/* FALLTHROUGH */ |
|
case('!'): |
|
/* FALLTHROUGH */ |
|
case(')'): |
|
/* FALLTHROUGH */ |
|
case(']'): |
|
/* FALLTHROUGH */ |
|
case('}'): |
|
if ( ! (TERMP_IGNDELIM & p->flags)) |
|
p->flags |= TERMP_NOSPACE; |
|
break; |
|
default: |
|
break; |
|
} |
|
|
if ( ! (TERMP_NOSPACE & p->flags)) |
if ( ! (TERMP_NOSPACE & p->flags)) |
buffer(p, ' '); |
buffer(p, ' '); |
|
|
if ( ! (p->flags & TERMP_NONOSPACE)) |
if ( ! (p->flags & TERMP_NONOSPACE)) |
p->flags &= ~TERMP_NOSPACE; |
p->flags &= ~TERMP_NOSPACE; |
|
|
for (sv = word; *word; word++) |
for ( ; *word; word++) |
if ('\\' != *word) |
if ('\\' != *word) |
encode(p, *word); |
encode(p, *word); |
else |
else |
do_escaped(p, &word); |
do_escaped(p, &word); |
|
|
if (isopendelim(sv)) |
if (sv[0] && 0 == sv[1]) |
p->flags |= TERMP_NOSPACE; |
switch (sv[0]) { |
|
case('('): |
|
/* FALLTHROUGH */ |
|
case('['): |
|
/* FALLTHROUGH */ |
|
case('{'): |
|
p->flags |= TERMP_NOSPACE; |
|
break; |
|
default: |
|
break; |
|
} |
} |
} |
|
|
|
|