| ... | @@ -1845,9 +1845,9 @@ const NAV_MODES = { | ... | @@ -1845,9 +1845,9 @@ const NAV_MODES = { |
| 1845 | let structObj = typeObj; | 1845 | let structObj = typeObj; |
| 1846 | let name = ""; | 1846 | let name = ""; |
| 1847 | if (opts.wantHtml) { | 1847 | if (opts.wantHtml) { |
| 1848 | name = "<span class='tok-kw'>struct</span> { "; | 1848 | name = "<span class='tok-kw'>struct</span>"; |
| 1849 | } else { | 1849 | } else { |
| 1850 | name = "struct { "; | 1850 | name = "struct"; |
| 1851 | } | 1851 | } |
| 1852 | if (structObj.backing_int !== null) { | 1852 | if (structObj.backing_int !== null) { |
| 1853 | if (opts.wantHtml) { | 1853 | if (opts.wantHtml) { |
| ... | @@ -1983,11 +1983,11 @@ const NAV_MODES = { | ... | @@ -1983,11 +1983,11 @@ const NAV_MODES = { |
| 1983 | name += " (" + exprName(unionObj.tag, opts) + ")"; | 1983 | name += " (" + exprName(unionObj.tag, opts) + ")"; |
| 1984 | } | 1984 | } |
| 1985 | name += " { "; | 1985 | name += " { "; |
| 1986 | if (unionObj.fields.length > 1 && opts.wantHtml) { | 1986 | if (unionObj.field_types.length > 1 && opts.wantHtml) { |
| 1987 | name += "</br>"; | 1987 | name += "</br>"; |
| 1988 | } | 1988 | } |
| 1989 | let indent = ""; | 1989 | let indent = ""; |
| 1990 | if (unionObj.fields.length > 1 && opts.wantHtml) { | 1990 | if (unionObj.field_types.length > 1 && opts.wantHtml) { |
| 1991 | indent = "&nbsp;&nbsp;&nbsp;&nbsp;" | 1991 | indent = "&nbsp;&nbsp;&nbsp;&nbsp;" |
| 1992 | } | 1992 | } |
| 1993 | if (opts.indent) { | 1993 | if (opts.indent) { |
| ... | @@ -1995,17 +1995,17 @@ const NAV_MODES = { | ... | @@ -1995,17 +1995,17 @@ const NAV_MODES = { |
| 1995 | } | 1995 | } |
| 1996 | let unionNode = getAstNode(unionObj.src); | 1996 | let unionNode = getAstNode(unionObj.src); |
| 1997 | let field_end = ","; | 1997 | let field_end = ","; |
| 1998 | if (unionObj.fields.length > 1 && opts.wantHtml) { | 1998 | if (unionObj.field_types.length > 1 && opts.wantHtml) { |
| 1999 | field_end += "</br>"; | 1999 | field_end += "</br>"; |
| 2000 | } else { | 2000 | } else { |
| 2001 | field_end += " "; | 2001 | field_end += " "; |
| 2002 | } | 2002 | } |
| 2003 | for (let i = 0; i < unionObj.fields.length; i += 1) { | 2003 | for (let i = 0; i < unionObj.field_types.length; i += 1) { |
| 2004 | let fieldNode = getAstNode(unionNode.fields[i]); | 2004 | let fieldNode = getAstNode(unionNode.fields[i]); |
| 2005 | let fieldName = fieldNode.name; | 2005 | let fieldName = fieldNode.name; |
| 2006 | let html = indent + escapeHtml(fieldName); | 2006 | let html = indent + escapeHtml(fieldName); |
| 2007 | | 2007 | |
| 2008 | let fieldTypeExpr = unionObj.fields[i]; | 2008 | let fieldTypeExpr = unionObj.field_types[i]; |
| 2009 | html += ": "; | 2009 | html += ": "; |
| 2010 | | 2010 | |
| 2011 | html += exprName(fieldTypeExpr, { ...opts, indent: indent }); | 2011 | html += exprName(fieldTypeExpr, { ...opts, indent: indent }); |