diff options
Diffstat (limited to 'helpers')
| -rw-r--r-- | helpers/ChangeLog | 8 | ||||
| -rwxr-xr-x | helpers/do.outline | 102 | ||||
| -rw-r--r-- | helpers/testdfa.c | 12 |
3 files changed, 118 insertions, 4 deletions
diff --git a/helpers/ChangeLog b/helpers/ChangeLog index 4b720787..91d43464 100644 --- a/helpers/ChangeLog +++ b/helpers/ChangeLog @@ -1,3 +1,11 @@ +2013-12-21 Arnold D. Robbins <arnold@skeeve.com> + + * testdfa.c: Fix some bugs and compiler warnings. + +2013-12-12 Arnold D. Robbins <arnold@skeeve.com> + + * do.outline: New file. + 2013-06-27 Arnold D. Robbins <arnold@skeeve.com> * ChangeLog: Created. diff --git a/helpers/do.outline b/helpers/do.outline new file mode 100755 index 00000000..203d27ad --- /dev/null +++ b/helpers/do.outline @@ -0,0 +1,102 @@ +#! /usr/local/bin2/gawk -f + +# do.outline --- produce an outline of a texinfo document + +BEGIN { + # manifest constants + TRUE = 1 + FALSE = 0 + + # Levels at which different nodes can be + Level["@top"] = 0 + Level["@appendix"] = 1 + Level["@chapter"] = 1 + Level["@majorheading"] = 1 + Level["@unnumbered"] = 1 + Level["@preface"] = 1 + Level["@appendixsec"] = 2 + Level["@heading"] = 2 + Level["@section"] = 2 + Level["@unnumberedsec"] = 2 + Level["@unnumberedsubsec"] = 3 + Level["@appendixsubsec"] = 3 + Level["@subheading"] = 3 + Level["@subsection"] = 3 + Level["@appendixsubsubsec"] = 4 + Level["@subsubheading"] = 4 + Level["@subsubsection"] = 4 + Level["@unnumberedsubsubsec"] = 4 + + ah = bh = ch = 0 + + appendix = 0 +} + +/^@ignore/ && Pass == 1, /^@end[ \t]+ignore/ && Pass == 1 { + next +} + + +$1 in Level { + # save type + type = $1 + + lev = Level[$1] + + if (lev == 1 && tolower($0) !~ /preface|foreword/) { + if ($1 == "@appendix") { + appendix = next_appendix(appendix) + ah = appendix + } else + ah++ + bh = ch = dh = 0 + } else if (lev == 2) { + bh++ + ch = dh = 0 + } else if (lev == 3) { + ch++ + dh = 0 + } else if (lev == 4) + dh++ + + Unnumbered = ($1 ~ /^@unnumbered/) + + $1 = "" + $0 = preprocess($0) + + for (i = 1; i < lev; i++) + printf "\t" + + if (! Unnumbered) { + printf("%s.", ah) + if (bh) + printf("%d.", bh) + if (ch) + printf("%d.", ch) + if (dh) + printf("%d.", dh) + } + + printf("%s\n", $0) +} + +function preprocess(record) +{ + record = gensub(/@(code|command|samp|env)\{([^\}]+)\}/, "\\2", "g", record) + record = gensub(/@dots\{\}/, "...", "g", record) + + return record +} + +function next_appendix(cur, ind, letters) +{ + if (cur == 0) + return "A" # first time + + letters = "ABCDEFGHIJKLMNOPQRSTUVWXYZ" + ind = index(letters, cur) + if (ind > 0 && ind <= 26) + return substr(letters, ++ind, 1) + + return "Z" +} diff --git a/helpers/testdfa.c b/helpers/testdfa.c index c644fb04..813acaab 100644 --- a/helpers/testdfa.c +++ b/helpers/testdfa.c @@ -76,7 +76,6 @@ int main(int argc, char **argv) size_t len; const char *pattern; const char *rerr; - int infd; char *data; reg_syntax_t dfa_syn; bool ignorecase = false; @@ -180,7 +179,7 @@ int main(int argc, char **argv) /* run the regex matcher */ ret = re_search(& pat, data, len, 0, len, NULL); - printf("re_search returned %d (%s)\n", ret, (ret != 0) ? "true" : "false"); + printf("re_search returned position %d (%s)\n", ret, (ret >= 0) ? "true" : "false"); /* run the dfa matcher */ /* @@ -202,6 +201,8 @@ int main(int argc, char **argv) free(regs.end); dfafree(dfareg); free(dfareg); + + return 0; } /* genflags2str --- general routine to convert a flag value to a string */ @@ -366,12 +367,15 @@ setup_pattern(const char *pattern, size_t len) { size_t is_multibyte = 0; int c, c2; - size_t buflen; + size_t buflen = 0; mbstate_t mbs; bool has_anchor = false; - char *buf, *dest; + char *buf = NULL; + char *dest; const char *src, *end; + memset(& mbs, 0, sizeof(mbs)); + src = pattern; end = pattern + len; |