~mdw
/
sgt
/
halibut
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revamp of the Halibut error handling mechanism.
[sgt/halibut]
/
input.c
diff --git
a/input.c
b/input.c
index
1410022
..
1ec733c
100644
(file)
--- a/
input.c
+++ b/
input.c
@@
-49,7
+49,7
@@
static void macrodef(tree234 *macros, wchar_t *name, wchar_t *text,
m->name = name;
m->text = text;
if (add234(macros, m) != m) {
m->name = name;
m->text = text;
if (add234(macros, m) != m) {
- err
or(err_macroexists,
&fpos, name);
+ err
_macroexists(
&fpos, name);
sfree(name);
sfree(text);
}
sfree(name);
sfree(text);
}
@@
-693,7
+693,7
@@
static void read_file(paragraph ***ret, input *in, indexdata *idx,
wtype == word_WeakCode) {
wtype = word_Emph;
} else {
wtype == word_WeakCode) {
wtype = word_Emph;
} else {
- err
or(err_brokencodepara,
&t.pos);
+ err
_brokencodepara(
&t.pos);
prev_para_type = par.type;
addpara(par, ret);
while (t.type != tok_eop) /* error recovery: */
prev_para_type = par.type;
addpara(par, ret);
while (t.type != tok_eop) /* error recovery: */
@@
-722,7
+722,7
@@
static void read_file(paragraph ***ret, input *in, indexdata *idx,
*/
dtor(t), t = get_token(in);
if (t.type != tok_lbrace) {
*/
dtor(t), t = get_token(in);
if (t.type != tok_lbrace) {
- err
or(err_explbr,
&t.pos);
+ err
_explbr(
&t.pos);
continue;
}
continue;
}
@@
-765,7
+765,7
@@
static void read_file(paragraph ***ret, input *in, indexdata *idx,
* don't give a cascade error.
*/
sitem->type = -1;
* don't give a cascade error.
*/
sitem->type = -1;
- err
or(err_misplacedlcont,
&t.pos);
+ err
_misplacedlcont(
&t.pos);
}
} else {
/*
}
} else {
/*
@@
-790,7
+790,7
@@
static void read_file(paragraph ***ret, input *in, indexdata *idx,
} else if (t.type == tok_rbrace) {
struct crossparaitem *sitem = stk_pop(crossparastk);
if (!sitem)
} else if (t.type == tok_rbrace) {
struct crossparaitem *sitem = stk_pop(crossparastk);
if (!sitem)
- err
or(err_unexbrace,
&t.pos);
+ err
_unexbrace(
&t.pos);
else {
switch (sitem->type) {
case c_lcont:
else {
switch (sitem->type) {
case c_lcont:
@@
-832,7
+832,7
@@
static void read_file(paragraph ***ret, input *in, indexdata *idx,
needkw = -1;
break;
case c__invalid:
needkw = -1;
break;
case c__invalid:
- err
or(err_badparatype,
t.text, &t.pos);
+ err
_badparatype(
t.text, &t.pos);
needkw = 4;
break;
case c__comment:
needkw = 4;
break;
case c__comment:
@@
-891,8
+891,7
@@
static void read_file(paragraph ***ret, input *in, indexdata *idx,
par.type == para_UnnumberedChapter) {
struct crossparaitem *sitem = stk_top(crossparastk);
if (sitem && (sitem->seen_lcont || sitem->seen_quote)) {
par.type == para_UnnumberedChapter) {
struct crossparaitem *sitem = stk_top(crossparastk);
if (sitem && (sitem->seen_lcont || sitem->seen_quote)) {
- error(err_sectmarkerinblock,
- &t.pos,
+ err_sectmarkerinblock( &t.pos,
(sitem->seen_lcont ? "lcont" : "quote"));
}
}
(sitem->seen_lcont ? "lcont" : "quote"));
}
}
@@
-945,7
+944,7
@@
static void read_file(paragraph ***ret, input *in, indexdata *idx,
}
}
if (t.type != tok_rbrace) {
}
}
if (t.type != tok_rbrace) {
- err
or(err_kwunclosed,
&t.pos);
+ err
_kwunclosed(
&t.pos);
continue;
}
rdadd(&rs, 0); /* add string terminator */
continue;
}
rdadd(&rs, 0); /* add string terminator */
@@
-958,11
+957,11
@@
static void read_file(paragraph ***ret, input *in, indexdata *idx,
/* See whether we have the right number of keywords. */
if ((needkw & 48) && nkeys > 0)
/* See whether we have the right number of keywords. */
if ((needkw & 48) && nkeys > 0)
- err
or(err_kwillegal,
&fp);
+ err
_kwillegal(
&fp);
if ((needkw & 11) && nkeys == 0)
if ((needkw & 11) && nkeys == 0)
- err
or(err_kwexpected,
&fp);
+ err
_kwexpected(
&fp);
if ((needkw & 5) && nkeys > 1)
if ((needkw & 5) && nkeys > 1)
- err
or(err_kwtoomany,
&fp);
+ err
_kwtoomany(
&fp);
if (is_macro) {
/*
if (is_macro) {
/*
@@
-996,7
+995,7
@@
static void read_file(paragraph ***ret, input *in, indexdata *idx,
if (t.type != tok_eop && t.type != tok_eof &&
(start_cmd == c__invalid ||
t.type != tok_cmd || t.cmd != start_cmd)) {
if (t.type != tok_eop && t.type != tok_eof &&
(start_cmd == c__invalid ||
t.type != tok_cmd || t.cmd != start_cmd)) {
- err
or(err_bodyillegal,
&t.pos);
+ err
_bodyillegal(
&t.pos);
/* Error recovery: eat the rest of the paragraph */
while (t.type != tok_eop && t.type != tok_eof &&
(start_cmd == c__invalid ||
/* Error recovery: eat the rest of the paragraph */
while (t.type != tok_eop && t.type != tok_eof &&
(start_cmd == c__invalid ||
@@
-1113,7
+1112,7
@@
static void read_file(paragraph ***ret, input *in, indexdata *idx,
}
break;
case tok_lbrace:
}
break;
case tok_lbrace:
- err
or(err_unexbrace,
&t.pos);
+ err
_unexbrace(
&t.pos);
/* Error recovery: push nop */
sitem = snew(struct stack_item);
sitem->type = stack_nop;
/* Error recovery: push nop */
sitem = snew(struct stack_item);
sitem->type = stack_nop;
@@
-1199,7
+1198,7
@@
static void read_file(paragraph ***ret, input *in, indexdata *idx,
*/
dtor(t), t = get_token(in);
if (t.type != tok_lbrace) {
*/
dtor(t), t = get_token(in);
if (t.type != tok_lbrace) {
- err
or(err_explbr,
&t.pos);
+ err
_explbr(
&t.pos);
} else {
int braces = 1;
while (braces > 0) {
} else {
int braces = 1;
while (braces > 0) {
@@
-1209,7
+1208,7
@@
static void read_file(paragraph ***ret, input *in, indexdata *idx,
else if (t.type == tok_rbrace)
braces--;
else if (t.type == tok_eof) {
else if (t.type == tok_rbrace)
braces--;
else if (t.type == tok_eof) {
- err
or(err_commenteof,
&t.pos);
+ err
_commenteof(
&t.pos);
break;
}
}
break;
}
}
@@
-1228,7
+1227,7
@@
static void read_file(paragraph ***ret, input *in, indexdata *idx,
type = t.cmd;
dtor(t), t = get_token(in);
if (t.type != tok_lbrace) {
type = t.cmd;
dtor(t), t = get_token(in);
if (t.type != tok_lbrace) {
- err
or(err_explbr,
&t.pos);
+ err
_explbr(
&t.pos);
} else {
/*
* Enforce that \q may not be used anywhere
} else {
/*
* Enforce that \q may not be used anywhere
@@
-1257,7
+1256,7
@@
static void read_file(paragraph ***ret, input *in, indexdata *idx,
}
stype = stack_quote;
} else {
}
stype = stack_quote;
} else {
- err
or(err_codequote,
&t.pos);
+ err
_codequote(
&t.pos);
stype = stack_nop;
}
sitem = snew(struct stack_item);
stype = stack_nop;
}
sitem = snew(struct stack_item);
@@
-1265,7
+1264,7
@@
static void read_file(paragraph ***ret, input *in, indexdata *idx,
sitem->type = stype;
if (type == c_cq) {
if (style != word_Normal) {
sitem->type = stype;
if (type == c_cq) {
if (style != word_Normal) {
- err
or(err_nestedstyles,
&t.pos);
+ err
_nestedstyles(
&t.pos);
} else {
style = word_WeakCode;
spcstyle = tospacestyle(style);
} else {
style = word_WeakCode;
spcstyle = tospacestyle(style);
@@
-1303,7
+1302,7
@@
static void read_file(paragraph ***ret, input *in, indexdata *idx,
wdtext = ustrftime(NULL, broken);
wd.type = style;
} else {
wdtext = ustrftime(NULL, broken);
wd.type = style;
} else {
- err
or(err_explbr,
&t.pos);
+ err
_explbr(
&t.pos);
wdtext = NULL;
}
} else {
wdtext = NULL;
}
} else {
@@
-1325,7
+1324,7
@@
static void read_file(paragraph ***ret, input *in, indexdata *idx,
}
sfree(rs.text);
if (t.type != tok_rbrace) {
}
sfree(rs.text);
if (t.type != tok_rbrace) {
- err
or(err_kwexprbr,
&t.pos);
+ err
_kwexprbr(
&t.pos);
}
}
wd.alt = NULL;
}
}
wd.alt = NULL;
@@
-1355,7
+1354,7
@@
static void read_file(paragraph ***ret, input *in, indexdata *idx,
if (t.type == tok_cmd &&
(t.cmd == c_i || t.cmd == c_ii)) {
if (indexing) {
if (t.type == tok_cmd &&
(t.cmd == c_i || t.cmd == c_ii)) {
if (indexing) {
- err
or(err_nestedindex,
&t.pos);
+ err
_nestedindex(
&t.pos);
} else {
/* Add an index-reference word with no
* text as yet */
} else {
/* Add an index-reference word with no
* text as yet */
@@
-1386,7
+1385,7
@@
static void read_file(paragraph ***ret, input *in, indexdata *idx,
if (t.type == tok_cmd &&
(t.cmd == c_e || t.cmd == c_c || t.cmd == c_cw)) {
if (style != word_Normal)
if (t.type == tok_cmd &&
(t.cmd == c_e || t.cmd == c_c || t.cmd == c_cw)) {
if (style != word_Normal)
- err
or(err_nestedstyles,
&t.pos);
+ err
_nestedstyles(
&t.pos);
else {
style = (t.cmd == c_c ? word_Code :
t.cmd == c_cw ? word_WeakCode :
else {
style = (t.cmd == c_c ? word_Code :
t.cmd == c_cw ? word_WeakCode :
@@
-1397,7
+1396,7
@@
static void read_file(paragraph ***ret, input *in, indexdata *idx,
dtor(t), t = get_token(in);
}
if (t.type != tok_lbrace) {
dtor(t), t = get_token(in);
}
if (t.type != tok_lbrace) {
- err
or(err_explbr,
&t.pos);
+ err
_explbr(
&t.pos);
sfree(sitem);
} else {
stk_push(parsestk, sitem);
sfree(sitem);
} else {
stk_push(parsestk, sitem);
@@
-1409,7
+1408,7
@@
static void read_file(paragraph ***ret, input *in, indexdata *idx,
case c_e:
type = t.cmd;
if (style != word_Normal) {
case c_e:
type = t.cmd;
if (style != word_Normal) {
- err
or(err_nestedstyles,
&t.pos);
+ err
_nestedstyles(
&t.pos);
/* Error recovery: eat lbrace, push nop. */
dtor(t), t = get_token(in);
sitem = snew(struct stack_item);
/* Error recovery: eat lbrace, push nop. */
dtor(t), t = get_token(in);
sitem = snew(struct stack_item);
@@
-1419,7
+1418,7
@@
static void read_file(paragraph ***ret, input *in, indexdata *idx,
}
dtor(t), t = get_token(in);
if (t.type != tok_lbrace) {
}
dtor(t), t = get_token(in);
if (t.type != tok_lbrace) {
- err
or(err_explbr,
&t.pos);
+ err
_explbr(
&t.pos);
} else {
style = (type == c_c ? word_Code :
type == c_cw ? word_WeakCode :
} else {
style = (type == c_c ? word_Code :
type == c_cw ? word_WeakCode :
@@
-1436,7
+1435,7
@@
static void read_file(paragraph ***ret, input *in, indexdata *idx,
case c_I:
type = t.cmd;
if (indexing) {
case c_I:
type = t.cmd;
if (indexing) {
- err
or(err_nestedindex,
&t.pos);
+ err
_nestedindex(
&t.pos);
/* Error recovery: eat lbrace, push nop. */
dtor(t), t = get_token(in);
sitem = snew(struct stack_item);
/* Error recovery: eat lbrace, push nop. */
dtor(t), t = get_token(in);
sitem = snew(struct stack_item);
@@
-1455,7
+1454,7
@@
static void read_file(paragraph ***ret, input *in, indexdata *idx,
if (t.type == tok_cmd &&
(t.cmd == c_e || t.cmd == c_c || t.cmd == c_cw)) {
if (style != word_Normal)
if (t.type == tok_cmd &&
(t.cmd == c_e || t.cmd == c_c || t.cmd == c_cw)) {
if (style != word_Normal)
- err
or(err_nestedstyles,
&t.pos);
+ err
_nestedstyles(
&t.pos);
else {
style = (t.cmd == c_c ? word_Code :
t.cmd == c_cw ? word_WeakCode :
else {
style = (t.cmd == c_c ? word_Code :
t.cmd == c_cw ? word_WeakCode :
@@
-1467,7
+1466,7
@@
static void read_file(paragraph ***ret, input *in, indexdata *idx,
}
if (t.type != tok_lbrace) {
sfree(sitem);
}
if (t.type != tok_lbrace) {
sfree(sitem);
- err
or(err_explbr,
&t.pos);
+ err
_explbr(
&t.pos);
} else {
/* Add an index-reference word with no text as yet */
wd.type = word_IndexRef;
} else {
/* Add an index-reference word with no text as yet */
wd.type = word_IndexRef;
@@
-1530,7
+1529,7
@@
static void read_file(paragraph ***ret, input *in, indexdata *idx,
break;
default:
if (!macrolookup(macros, in, t.text, &t.pos))
break;
default:
if (!macrolookup(macros, in, t.text, &t.pos))
- err
or(err_badmidcmd,
t.text, &t.pos);
+ err
_badmidcmd(
t.text, &t.pos);
break;
}
}
break;
}
}
@@
-1543,7
+1542,7
@@
static void read_file(paragraph ***ret, input *in, indexdata *idx,
if (stk_top(parsestk)) {
while ((sitem = stk_pop(parsestk)))
sfree(sitem);
if (stk_top(parsestk)) {
while ((sitem = stk_pop(parsestk)))
sfree(sitem);
- err
or(err_missingrbrace,
&t.pos);
+ err
_missingrbrace(
&t.pos);
}
stk_free(parsestk);
prev_para_type = par.type;
}
stk_free(parsestk);
prev_para_type = par.type;
@@
-1565,7
+1564,7
@@
static void read_file(paragraph ***ret, input *in, indexdata *idx,
if (stk_top(crossparastk)) {
void *p;
if (stk_top(crossparastk)) {
void *p;
- err
or(err_missingrbrace2,
&t.pos);
+ err
_missingrbrace2(
&t.pos);
while ((p = stk_pop(crossparastk)))
sfree(p);
}
while ((p = stk_pop(crossparastk)))
sfree(p);
}