version 1.130, 2019/04/16 14:26:27 |
version 1.133, 2019/04/21 15:24:05 |
Line 315 pnode_printciterefentry(struct format *f, struct pnode |
|
Line 315 pnode_printciterefentry(struct format *f, struct pnode |
|
pnode_unlinksub(n); |
pnode_unlinksub(n); |
} |
} |
|
|
static void |
|
pnode_printfuncdef(struct format *f, struct pnode *n) |
|
{ |
|
struct pnode *nc; |
|
|
|
nc = TAILQ_FIRST(&n->childq); |
|
if (nc != NULL && nc->node == NODE_TEXT) { |
|
macro_argline(f, "Ft", nc->b); |
|
pnode_unlink(nc); |
|
} |
|
macro_nodeline(f, "Fo", n, ARG_SINGLE); |
|
pnode_unlinksub(n); |
|
} |
|
|
|
/* |
/* |
* The <mml:mfenced> node is a little peculiar. |
* The <mml:mfenced> node is a little peculiar. |
* First, it can have arbitrary open and closing tokens, which default |
* First, it can have arbitrary open and closing tokens, which default |
Line 389 pnode_printmath(struct format *f, struct pnode *n) |
|
Line 375 pnode_printmath(struct format *f, struct pnode *n) |
|
static void |
static void |
pnode_printfuncprototype(struct format *f, struct pnode *n) |
pnode_printfuncprototype(struct format *f, struct pnode *n) |
{ |
{ |
struct pnode *nc, *fdef; |
struct pnode *fdef, *ftype, *nc, *nn; |
|
|
TAILQ_FOREACH(fdef, &n->childq, child) |
/* |
if (fdef->node == NODE_FUNCDEF) |
* Extract <funcdef> child and ignore <void> child. |
|
* Leave other children in place, to be treated as parameters. |
|
*/ |
|
|
|
fdef = NULL; |
|
TAILQ_FOREACH_SAFE(nc, &n->childq, child, nn) { |
|
switch (nc->node) { |
|
case NODE_FUNCDEF: |
|
if (fdef == NULL) { |
|
fdef = nc; |
|
TAILQ_REMOVE(&n->childq, nc, child); |
|
nc->parent = NULL; |
|
} |
break; |
break; |
|
case NODE_VOID: |
|
pnode_unlink(nc); |
|
break; |
|
default: |
|
break; |
|
} |
|
} |
|
|
|
/* |
|
* If no children are left, the function is void; use .Fn. |
|
* Otherwise, use .Fo. |
|
*/ |
|
|
|
nc = TAILQ_FIRST(&n->childq); |
if (fdef != NULL) { |
if (fdef != NULL) { |
pnode_printfuncdef(f, fdef); |
ftype = TAILQ_FIRST(&fdef->childq); |
|
if (ftype != NULL && ftype->node == NODE_TEXT) { |
|
macro_argline(f, "Ft", ftype->b); |
|
pnode_unlink(ftype); |
|
} |
|
if (nc == NULL) { |
|
macro_open(f, "Fn"); |
|
macro_addnode(f, fdef, ARG_SPACE | ARG_SINGLE); |
|
macro_addarg(f, "void", ARG_SPACE); |
|
macro_close(f); |
|
} else |
|
macro_nodeline(f, "Fo", fdef, ARG_SINGLE); |
pnode_unlink(fdef); |
pnode_unlink(fdef); |
} else |
} else if (nc == NULL) |
|
macro_line(f, "Fn UNKNOWN void"); |
|
else |
macro_line(f, "Fo UNKNOWN"); |
macro_line(f, "Fo UNKNOWN"); |
|
|
TAILQ_FOREACH(nc, &n->childq, child) |
if (nc == NULL) |
macro_nodeline(f, "Fa", nc, ARG_SINGLE); |
return; |
|
|
|
while (nc != NULL) { |
|
macro_nodeline(f, "Fa", nc, ARG_SINGLE); |
|
pnode_unlink(nc); |
|
nc = TAILQ_FIRST(&n->childq); |
|
} |
macro_line(f, "Fc"); |
macro_line(f, "Fc"); |
pnode_unlinksub(n); |
|
} |
} |
|
|
/* |
/* |
Line 901 pnode_printrefentry(struct format *f, struct pnode *n) |
|
Line 929 pnode_printrefentry(struct format *f, struct pnode *n) |
|
static void |
static void |
pnode_printvarlistentry(struct format *f, struct pnode *n) |
pnode_printvarlistentry(struct format *f, struct pnode *n) |
{ |
{ |
struct pnode *nc, *nn; |
struct pnode *nc, *nn, *ncc; |
int first = 1; |
int comma; |
|
|
macro_open(f, "It"); |
macro_open(f, "It"); |
f->parastate = PARA_HAVE; |
f->parastate = PARA_HAVE; |
f->flags |= FMT_IMPL; |
f->flags |= FMT_IMPL; |
|
comma = -1; |
TAILQ_FOREACH_SAFE(nc, &n->childq, child, nn) { |
TAILQ_FOREACH_SAFE(nc, &n->childq, child, nn) { |
if (nc->node != NODE_TERM && nc->node != NODE_GLOSSTERM) |
if (nc->node != NODE_TERM && nc->node != NODE_GLOSSTERM) |
continue; |
continue; |
if (first == 0) { |
if (comma != -1) { |
switch (f->linestate) { |
switch (f->linestate) { |
case LINE_NEW: |
case LINE_NEW: |
break; |
break; |
Line 918 pnode_printvarlistentry(struct format *f, struct pnode |
|
Line 947 pnode_printvarlistentry(struct format *f, struct pnode |
|
print_text(f, ",", 0); |
print_text(f, ",", 0); |
break; |
break; |
case LINE_MACRO: |
case LINE_MACRO: |
macro_addarg(f, ",", 0); |
macro_addarg(f, ",", comma); |
break; |
break; |
} |
} |
} |
} |
f->parastate = PARA_HAVE; |
f->parastate = PARA_HAVE; |
|
comma = (ncc = TAILQ_FIRST(&nc->childq)) == NULL || |
|
pnode_class(ncc->node) == CLASS_TEXT ? 0 : ARG_SPACE; |
pnode_print(f, nc); |
pnode_print(f, nc); |
pnode_unlink(nc); |
pnode_unlink(nc); |
first = 0; |
|
} |
} |
macro_close(f); |
macro_close(f); |
f->parastate = PARA_HAVE; |
f->parastate = PARA_HAVE; |
Line 1184 pnode_print(struct format *f, struct pnode *n) |
|
Line 1214 pnode_print(struct format *f, struct pnode *n) |
|
pnode_printgroup(f, n); |
pnode_printgroup(f, n); |
break; |
break; |
case NODE_KEYSYM: |
case NODE_KEYSYM: |
|
case NODE_PRODUCTNAME: |
macro_open(f, "Sy"); |
macro_open(f, "Sy"); |
break; |
break; |
case NODE_LINK: |
case NODE_LINK: |
Line 1339 pnode_print(struct format *f, struct pnode *n) |
|
Line 1370 pnode_print(struct format *f, struct pnode *n) |
|
break; |
break; |
case NODE_VARNAME: |
case NODE_VARNAME: |
macro_open(f, "Va"); |
macro_open(f, "Va"); |
|
break; |
|
case NODE_VOID: |
|
print_text(f, "void", ARG_SPACE); |
break; |
break; |
case NODE_XREF: |
case NODE_XREF: |
pnode_printxref(f, n); |
pnode_printxref(f, n); |