summaryrefslogtreecommitdiffstats
path: root/usr.bin/mandoc/mdoc_macro.c (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
* Second step towards parser unification:schwarze2015-04-021-40/+38
| | | | | | | | | Replace struct mdoc_node and struct man_node by a unified struct roff_node. To be able to use the tok member for both mdoc(7) and man(7) without defining all the macros in roff.h, sacrifice a tiny bit of type safety and make tok an int rather than an enum. Almost mechanical, no functional change. Written on the Eurostar from Bruxelles to London on the way to p2k15.
* First step towards parser unification:schwarze2015-04-021-20/+21
| | | | | | Replace enum mdoc_type and enum man_type by a unified enum roff_type. Almost mechanical, no functional change. Written on the ICE train from Frankfurt to Bruxelles on the way to p2k15.
* Delete the mdoc_node.pending pointer and the function calculatingschwarze2015-02-121-110/+78
| | | | | | | | | | | | | | | | | | | | | | | it, make_pending(), which was the most difficult function of the whole mdoc(7) parser. After almost five years of maintaining this hellhole, i just noticed the pointer isn't needed after all. Blocks are always rewound in the reverse order they were opened; that even holds for broken blocks. Consequently, it is sufficient to just mark broken blogs with the flag MDOC_BROKEN and breaking blocks with the flag MDOC_ENDED. When rewinding, instead of iterating the pending pointers, just iterate from each broken block to its parents, rewinding all that are MDOC_ENDED and stopping after processing the first ancestor that it not MDOC_BROKEN. For ENDBODY markers, use the mdoc_node.body pointer in place of the former mdoc_node.pending. This also fixes an assertion failure found by jsg@ with afl, test case #467 (Bo Bl It Bd Bc It), where (surprise surprise) the pending pointer got corrupted. Improved functionality, minus one function, minus one struct field, minus 50 lines of code.
* explicit blocks close out .Nd; fixing data structure corruptionschwarze2015-02-111-1/+8
| | | | | eventually leading to NULL pointer access; found by jsg@ with afl, text case #455.
* Be more careful to not generate empty .In, .St, and .Xr nodes.schwarze2015-02-101-34/+44
| | | | | | | | That could happen when their first argument was another called macro, causing a NULL pointer access in .St validation found by jsg@ with afl. Make in_line_argn() easier to understand by using one state variable rather than two.
* Closing a block validates it, which may end up deleting it,schwarze2015-02-071-1/+2
| | | | | so if we are in a loop over blocks, cleanly restart the loop rather than risking use after free; found by jsg@ with afl.
* Delete the legacy generic warning type MANDOCERR_ARGCWARN,schwarze2015-02-061-3/+4
| | | | | replacing the last instances by more specific warnings. Improved functionality, minus 50 lines of code.
* better handle .Fo and .Fd without argumentschwarze2015-02-061-1/+7
| | | | better handle .Fo with more than one argument
* better handle .In .Sh .Ss .St .Xr without argumentsschwarze2015-02-061-1/+12
|
* fix handling of empty .An macrosschwarze2015-02-051-2/+2
|
* Simplify by deleting the "lastline" member of struct mdoc_node.schwarze2015-02-051-8/+2
| | | | Minus one struct member, minus 17 lines of code, no functional change.
* Discard excess head arguments for .Bd .Bl .Bk and delete hwarn_eq0().schwarze2015-02-041-2/+8
| | | | | Discard empty .Bk blocks. Improve related diagnostics.
* discard .Rs head arguments and improve .Rs diagnosticsschwarze2015-02-041-4/+9
|
* Avoid closing out an explicit block twice when broken by .Itschwarze2015-02-031-1/+2
| | | | (assertion failure); regression found in jsg@'s afl test case 847.
* Finally delete the kitchensink functions rew_sub() and rew_dohalt().schwarze2015-02-031-160/+75
| | | | | | | They were a maintenance and auditing nightmare because if you changed one bit in there, stuff tended to break at seemingly unrelated places. No functional change except getting rid of one bogus error message, but minus 80 lines of code.
* Bring .Pp/.Lp handling inside .Nm blocks closer to groff;schwarze2015-02-031-4/+11
| | | | as a bonus, get rid of another call to rew_sub().
* Simplify and reindent make_pending(). No functional changeschwarze2015-02-021-57/+50
| | | | | | except that some error messages become less confusing. Now the function is almost readable (but still requires nineteen lines of comments for fourteen lines of code).
* Simplify: Do not call rew_dohalt() from make_pending(),schwarze2015-02-021-31/+21
| | | | | the calling macro handler already found the breaking block. No functional change except tiny variations in error messages.
* Get rid of all remaining calls to rew_sub() where the target blockschwarze2015-02-021-66/+37
| | | | | is known. This only leaves three that do actual searching. No functional change, minus 30 lines of code.
* Get rid of all calls to rew_sub() in blk_exp_close(); only ten callsschwarze2015-02-021-65/+67
| | | | | | remain in other functions. As a bonus, this fixes an assertion failure jsg@ found some time ago with afl (test case 982) and improves minor details in error reporting.
* When a full block macro gets closed out by a mismatchingschwarze2015-02-021-4/+7
| | | | | | | | | block closure macro it calls, do not attempt to open its body. This can for example happen for (nonsensical) constructions like .Fo .Nm Fc in the SYNOPSIS. Fixing an assertion failure jsg@ found with afl some time ago (test case number 731).
* get rid of rew_sub() in blk_part_imp(); no functional changeschwarze2015-02-011-3/+14
|
* Simplify blk_part_exp(), no functional change.schwarze2015-02-011-24/+8
| | | | | | * Replace calls to rew_sub() with rew_last() - two less out of 18. * No need to keep track of the body, it's always opened right after the head and never used for anything in this function.
* The function rew_sub() tries to rewind any all all kinds of blocksschwarze2015-02-011-5/+4
| | | | | | | | | | and elements under any and all circumstances, even handling some bad block nesting now and then. Little surprisingly, this ends up in excessive complexity and has caused many bugs in the past. Start to slowly disentangle this mess by replacing calls to rew_sub() immediately following mdoc_head_alloc() by the much simpler rew_last(). Gets rid of the first two rew_sub() calls out of twenty. No functional change.
* The code already pays attention not to close the same block twice.schwarze2014-12-221-3/+3
| | | | | | | Similarly, avoid having the same block break two other blocks. In some situations, this could lead to an endless loop in rew_sub() found by jsg@ with afl. Minimal example: .Po Ao Pc Bo Pc Ac Bc
* Fix two issues causing a class of assertion failures found by jsg@ with afl.schwarze2014-12-201-9/+20
| | | | | | | | 1) rew_sub(): Make sure REWIND_MORE is acted upon even when followed by REWIND_NONE. This prevents .It from ending up inside other children of .Bl. 2) blk_exp_close(): Only allow extension of .Bl when it has at least one .It. Otherwise, a broken child block could be moved in front of the .Bl, effectively resulting in a .Bl that ended before it began.
* Don't let .Ta creep into an already-closed list; same as for .It.schwarze2014-12-181-2/+3
| | | | Fixes an assertion found by jsg@ with afl.
* The code is already careful to not add items to lists that wereschwarze2014-12-181-21/+32
| | | | | | | already closed. In this respect, also consider lists closed that have broken another block, their closure pending until the end of the broken block. This avoids syntax tree corruption leading to a NULL pointer access found by jsg@ with afl.
* Fix a regression found by Carsten dot Kunze at arcor dot de:schwarze2014-12-131-5/+3
| | | | Do not show bogus quotes when .Bl -column phrases are quoted.
* Multiple fixes with respect to .Pf:schwarze2014-11-301-7/+17
| | | | | | | * The first argument of .Pf is not parsed. * Normal delimiter handling does not apply to the first argument of .Pf. * Warn if nothing follows a prefix (inspired by groff_mdoc(7)). * In that case, do not suppress spacing.
* warn about attempts to call non-callable macros;schwarze2014-11-301-9/+17
| | | | inspired by a similar warning in the groff_mdoc(7) macros
* Reduce code duplication by reusing the same argument parserschwarze2014-11-291-19/+21
| | | | | for in_line_eoln() macros and .Bl -column phrases. No functional change.
* Provide a helper function macro_or_word() and use it to prune theschwarze2014-11-291-116/+63
| | | | | | | | | | same chunk of argument parsing code out of five of the eight callback functions. The other three have too much special handling to participate. As a bonus, let lookup() and mdoc_args() deal with line macros and retire the lookup_raw() helper and the mdoc_zargs() internal interface function. No functional change, minus 40 lines of code.
* Fold the loop around mdoc_argv() into the function itself,schwarze2014-11-281-47/+5
| | | | | | it was the same in all four cases. As a bonus, get rid of one enum type that was used for internal communication. No functional change, minus 40 lines of code.
* Simplify by making the mdoc parser callbacks void, and some cleanup;schwarze2014-11-281-199/+117
| | | | no functional change, minus 50 lines of code.
* Simplify the code by making various mdoc parser helper functions void.schwarze2014-11-281-376/+234
| | | | No functional change, minus 130 lines of code.
* Simplify code by making mdoc validation handlers void.schwarze2014-11-281-53/+45
| | | | No functional change, minus 90 lines of code.
* Multiple fixes with respect to .Eo:schwarze2014-11-271-8/+28
| | | | | | | | 1. Correctly parse stray .Ec without preceding .Eo, avoiding an assertion violation found by jsg@ with afl. 2. Correctly parse .Ec arguments when breaking another block. 3. Correct spacing around closing delimiter when breaking another block. 4. Sync some related formatting control from -Tascii to -Thtml.
* The .Sm macro accepts at most one argument;schwarze2014-11-261-2/+2
| | | | fixing an assertion failure found by jsg@ with afl.
* Do not access a NULL pointer when a section has no body,schwarze2014-11-251-2/+4
| | | | | which can for example happen for .Sh Xo .Sh without .Xc. Crash found by jsg@ with afl.
* Fix two minibugs reported by Thomas Klausner <wiz at NetBSD>:schwarze2014-11-201-2/+5
| | | | | 1. The first argument of .Fn is not supposed to be parsed. 2. The .Fn macro is not supposed to reopen its scope after punctuation.
* Multiple fixes with respect to in-line macros:schwarze2014-11-171-25/+53
| | | | | | | | | | * .No selects the default font; relevant e.g. in .Bf blocks * no need to force empty .Li elements * closing delimiters as leading macro arguments do not suppress space * opening delimiters at the end of a macro line do not suppress space * correctly handle delimiter spacing in -Tman As a side effect, these fixes let mandoc warn about empty .No macros as requested by bentley@.
* Allow .ll in the prologue; Daniel Levai reports Slackware Linux uses this.schwarze2014-09-071-3/+3
|
* Right after .Fl, a middle delimiter triggers an empty scope,schwarze2014-08-211-14/+13
| | | | | | | | | | | | just like a closing delimiter. This didn't work in groff-1.15, but it now works in groff-1.22. After being closed by delimiters, .Nm scopes do not reopen. Do not suppress white space after .Fl if the next node is a text node on the same input line; that can happen for middle delimiters. Fixing an issue reported by jmc@.
* If a stray .It follows .El, we are no longer in the list,schwarze2014-08-161-2/+3
| | | | | | | even though the list is still the last processed macro. This fixes a regression introduced in mdoc_macro.c rev. 1.95: Ulrich Spoerlein <uqs at FreeBSD> reports that various of their kernel manuals trigger assertions.
* mention requests and macros in more messagesschwarze2014-08-081-2/+2
|
* Get rid of the useless FATAL error "child violates parent syntax".schwarze2014-08-081-1/+19
| | | | | When finding items outside lists, simply skip them and throw an ERROR. Handle subsections before the first section instead of bailing out.
* Clean up ERROR messages related to document structure and macros:schwarze2014-07-071-6/+10
| | | | Hierarchical naming and mention macro names in messages.
* Clean up messages regarding excess arguments:schwarze2014-07-041-6/+7
| | | | | | | * Downgrade ".Bf -emphasis Em" from FATAL to WARNING. * Mention the macros, the arguments, and the fallbacks. * Hierarchical naming. Also fix the handling of excess .It head arguments in -Tman.
* Improve and test the messages about empty macros,schwarze2014-07-021-4/+6
| | | | in particular reporting the macro names involved.
Copyright © 1996 – 2023 Jason A. Donenfeld. All Rights Reverse Engineered.