version 1.220, 2014/07/07 11:35:06 |
version 1.221, 2014/07/07 21:36:20 |
Line 786 roff_endparse(struct roff *r) |
|
Line 786 roff_endparse(struct roff *r) |
|
{ |
{ |
|
|
if (r->last) |
if (r->last) |
mandoc_msg(MANDOCERR_SCOPEEXIT, r->parse, |
mandoc_msg(MANDOCERR_BLK_NOEND, r->parse, |
r->last->line, r->last->col, NULL); |
r->last->line, r->last->col, |
|
roffs[r->last->tok].name); |
|
|
if (r->eqn) { |
if (r->eqn) { |
mandoc_msg(MANDOCERR_SCOPEEXIT, r->parse, |
mandoc_msg(MANDOCERR_BLK_NOEND, r->parse, |
r->eqn->eqn.ln, r->eqn->eqn.pos, NULL); |
r->eqn->eqn.ln, r->eqn->eqn.pos, "EQ"); |
eqn_end(&r->eqn); |
eqn_end(&r->eqn); |
} |
} |
|
|
if (r->tbl) { |
if (r->tbl) { |
mandoc_msg(MANDOCERR_SCOPEEXIT, r->parse, |
mandoc_msg(MANDOCERR_BLK_NOEND, r->parse, |
r->tbl->line, r->tbl->pos, NULL); |
r->tbl->line, r->tbl->pos, "TS"); |
tbl_end(&r->tbl); |
tbl_end(&r->tbl); |
} |
} |
} |
} |
Line 841 roff_cblock(ROFF_ARGS) |
|
Line 842 roff_cblock(ROFF_ARGS) |
|
*/ |
*/ |
|
|
if (NULL == r->last) { |
if (NULL == r->last) { |
mandoc_msg(MANDOCERR_NOSCOPE, r->parse, ln, ppos, NULL); |
mandoc_msg(MANDOCERR_BLK_NOTOPEN, r->parse, |
|
ln, ppos, ".."); |
return(ROFF_IGN); |
return(ROFF_IGN); |
} |
} |
|
|
Line 859 roff_cblock(ROFF_ARGS) |
|
Line 861 roff_cblock(ROFF_ARGS) |
|
case ROFF_ig: |
case ROFF_ig: |
break; |
break; |
default: |
default: |
mandoc_msg(MANDOCERR_NOSCOPE, r->parse, ln, ppos, NULL); |
mandoc_msg(MANDOCERR_BLK_NOTOPEN, r->parse, |
|
ln, ppos, ".."); |
return(ROFF_IGN); |
return(ROFF_IGN); |
} |
} |
|
|
Line 889 roff_ccond(struct roff *r, int ln, int ppos) |
|
Line 892 roff_ccond(struct roff *r, int ln, int ppos) |
|
{ |
{ |
|
|
if (NULL == r->last) { |
if (NULL == r->last) { |
mandoc_msg(MANDOCERR_NOSCOPE, r->parse, ln, ppos, NULL); |
mandoc_msg(MANDOCERR_BLK_NOTOPEN, r->parse, |
|
ln, ppos, "\\}"); |
return; |
return; |
} |
} |
|
|
Line 901 roff_ccond(struct roff *r, int ln, int ppos) |
|
Line 905 roff_ccond(struct roff *r, int ln, int ppos) |
|
case ROFF_if: |
case ROFF_if: |
break; |
break; |
default: |
default: |
mandoc_msg(MANDOCERR_NOSCOPE, r->parse, ln, ppos, NULL); |
mandoc_msg(MANDOCERR_BLK_NOTOPEN, r->parse, |
|
ln, ppos, "\\}"); |
return; |
return; |
} |
} |
|
|
if (r->last->endspan > -1) { |
if (r->last->endspan > -1) { |
mandoc_msg(MANDOCERR_NOSCOPE, r->parse, ln, ppos, NULL); |
mandoc_msg(MANDOCERR_BLK_NOTOPEN, r->parse, |
|
ln, ppos, "\\}"); |
return; |
return; |
} |
} |
|
|
Line 1793 roff_TE(ROFF_ARGS) |
|
Line 1799 roff_TE(ROFF_ARGS) |
|
{ |
{ |
|
|
if (NULL == r->tbl) |
if (NULL == r->tbl) |
mandoc_msg(MANDOCERR_NOSCOPE, r->parse, ln, ppos, NULL); |
mandoc_msg(MANDOCERR_BLK_NOTOPEN, r->parse, |
|
ln, ppos, "TE"); |
else |
else |
tbl_end(&r->tbl); |
tbl_end(&r->tbl); |
|
|
Line 1805 roff_T_(ROFF_ARGS) |
|
Line 1812 roff_T_(ROFF_ARGS) |
|
{ |
{ |
|
|
if (NULL == r->tbl) |
if (NULL == r->tbl) |
mandoc_msg(MANDOCERR_NOSCOPE, r->parse, ln, ppos, NULL); |
mandoc_msg(MANDOCERR_BLK_NOTOPEN, r->parse, |
|
ln, ppos, "T&"); |
else |
else |
tbl_restart(ppos, ln, r->tbl); |
tbl_restart(ppos, ln, r->tbl); |
|
|
Line 1856 static enum rofferr |
|
Line 1864 static enum rofferr |
|
roff_EN(ROFF_ARGS) |
roff_EN(ROFF_ARGS) |
{ |
{ |
|
|
mandoc_msg(MANDOCERR_NOSCOPE, r->parse, ln, ppos, NULL); |
mandoc_msg(MANDOCERR_BLK_NOTOPEN, r->parse, ln, ppos, "EN"); |
return(ROFF_IGN); |
return(ROFF_IGN); |
} |
} |
|
|
Line 1866 roff_TS(ROFF_ARGS) |
|
Line 1874 roff_TS(ROFF_ARGS) |
|
struct tbl_node *tbl; |
struct tbl_node *tbl; |
|
|
if (r->tbl) { |
if (r->tbl) { |
mandoc_msg(MANDOCERR_SCOPEBROKEN, r->parse, ln, ppos, NULL); |
mandoc_msg(MANDOCERR_BLK_BROKEN, r->parse, |
|
ln, ppos, "TS breaks TS"); |
tbl_end(&r->tbl); |
tbl_end(&r->tbl); |
} |
} |
|
|