version 1.184, 2011/04/09 15:29:40 |
version 1.185, 2011/04/29 22:18:12 |
Line 47 term_free(struct termp *p) |
|
Line 47 term_free(struct termp *p) |
|
if (p->buf) |
if (p->buf) |
free(p->buf); |
free(p->buf); |
if (p->symtab) |
if (p->symtab) |
chars_free(p->symtab); |
mchars_free(p->symtab); |
|
|
free(p); |
free(p); |
} |
} |
Line 350 numbered(struct termp *p, const char *word, size_t len |
|
Line 350 numbered(struct termp *p, const char *word, size_t len |
|
{ |
{ |
const char *rhs; |
const char *rhs; |
|
|
rhs = chars_num2char(word, len); |
rhs = mchars_num2char(word, len); |
if (rhs) |
if (rhs) |
encode(p, rhs, 1); |
encode(p, rhs, 1); |
} |
} |
Line 362 spec(struct termp *p, const char *word, size_t len) |
|
Line 362 spec(struct termp *p, const char *word, size_t len) |
|
const char *rhs; |
const char *rhs; |
size_t sz; |
size_t sz; |
|
|
rhs = chars_spec2str(p->symtab, word, len, &sz); |
rhs = mchars_spec2str(p->symtab, word, len, &sz); |
if (rhs) |
if (rhs) |
encode(p, rhs, sz); |
encode(p, rhs, sz); |
else if (1 == len) |
else if (1 == len) |
Line 376 res(struct termp *p, const char *word, size_t len) |
|
Line 376 res(struct termp *p, const char *word, size_t len) |
|
const char *rhs; |
const char *rhs; |
size_t sz; |
size_t sz; |
|
|
rhs = chars_res2str(p->symtab, word, len, &sz); |
rhs = mchars_res2str(p->symtab, word, len, &sz); |
if (rhs) |
if (rhs) |
encode(p, rhs, sz); |
encode(p, rhs, sz); |
} |
} |
Line 623 term_strlen(const struct termp *p, const char *cp) |
|
Line 623 term_strlen(const struct termp *p, const char *cp) |
|
|
|
switch (esc) { |
switch (esc) { |
case (ESCAPE_PREDEF): |
case (ESCAPE_PREDEF): |
rhs = chars_res2str |
rhs = mchars_res2str |
(p->symtab, seq, ssz, &rsz); |
(p->symtab, seq, ssz, &rsz); |
break; |
break; |
case (ESCAPE_SPECIAL): |
case (ESCAPE_SPECIAL): |
rhs = chars_spec2str |
rhs = mchars_spec2str |
(p->symtab, seq, ssz, &rsz); |
(p->symtab, seq, ssz, &rsz); |
|
|
if (ssz != 1 || rhs) |
if (ssz != 1 || rhs) |