Merge branch 'smurfix:master' into master

.travis.yml

@@ -1,7 +1,9 @@
 language: python
 python:
   - "2.7"
-  - "3.3"
   - "3.4"
+  - "3.5"
+  - "3.6"
+  - "3.7"
   - "pypy"
 script: sh test.sh

doc/yapps2.haux

@@ -1,31 +0,0 @@
-\@addtocsec{htoc}{1}{0}{\@print{1}\quad{}Introduction}
-\@addtocsec{htoc}{2}{0}{\@print{2}\quad{}Examples}
-\@addtocsec{htoc}{3}{1}{\@print{2.1}\quad{}Introduction to Grammars}
-\@addtocsec{htoc}{4}{1}{\@print{2.2}\quad{}Lisp Expressions}
-\@addtocsec{htoc}{5}{1}{\@print{2.3}\quad{}Calculator}
-\@addtocsec{htoc}{6}{1}{\@print{2.4}\quad{}Calculator with Memory}
-\@addtocsec{htoc}{7}{0}{\@print{3}\quad{}Grammars}
-\@addtocsec{htoc}{8}{1}{\@print{3.1}\quad{}Left Factoring}
-\newlabel{sec:Left-Factoring}{{3.1}{X}}
-\@addtocsec{htoc}{9}{1}{\@print{3.2}\quad{}Left Recursion}
-\@addtocsec{htoc}{10}{1}{\@print{3.3}\quad{}Ambiguous Grammars}
-\newlabel{sec:Ambiguous-Grammars}{{3.3}{X}}
-\@addtocsec{htoc}{11}{0}{\@print{4}\quad{}Customization}
-\@addtocsec{htoc}{12}{1}{\@print{4.1}\quad{}Customizing Parsers}
-\@addtocsec{htoc}{13}{1}{\@print{4.2}\quad{}Customizing Scanners}
-\@addtocsec{htoc}{14}{0}{\@print{5}\quad{}Parser Mechanics}
-\@addtocsec{htoc}{15}{1}{\@print{5.1}\quad{}Parser Objects}
-\newlabel{sec:Parser-Objects}{{5.1}{X}}
-\@addtocsec{htoc}{16}{1}{\@print{5.2}\quad{}Context Sensitive Scanner}
-\@addtocsec{htoc}{17}{1}{\@print{5.3}\quad{}Internal Variables}
-\@addtocsec{htoc}{18}{1}{\@print{5.4}\quad{}Pre- and Post-Parser Code}
-\@addtocsec{htoc}{19}{1}{\@print{5.5}\quad{}Representation of Grammars}
-\@addtocsec{htoc}{20}{0}{\@print{A}\quad{}Grammar for Parsers}
-\@addtocsec{htoc}{21}{0}{\@print{B}\quad{}Upgrading}
-\@addtocsec{htoc}{22}{0}{\@print{C}\quad{}Troubleshooting}
-\@addtocsec{htoc}{23}{0}{\@print{D}\quad{}History}
-\@addtocsec{htoc}{24}{0}{\@print{E}\quad{}Debian Extensions}
-\newlabel{sec:debian}{{E}{X}}
-\@addtocsec{htoc}{25}{0}{\@print{F}\quad{}Future Extensions}
-\newlabel{sec:future}{{F}{X}}
-\@addtocsec{htoc}{26}{0}{\@print{G}\quad{}References}

doc/yapps2.htoc

@@ -1,36 +0,0 @@
-\begin{tocenv}
-\tocitem \@locref{htoc1}{\begin{@norefs}\@print{1}\quad{}Introduction\end{@norefs}}
-\tocitem \@locref{htoc2}{\begin{@norefs}\@print{2}\quad{}Examples\end{@norefs}}
-\begin{tocenv}
-\tocitem \@locref{htoc3}{\begin{@norefs}\@print{2.1}\quad{}Introduction to Grammars\end{@norefs}}
-\tocitem \@locref{htoc4}{\begin{@norefs}\@print{2.2}\quad{}Lisp Expressions\end{@norefs}}
-\tocitem \@locref{htoc5}{\begin{@norefs}\@print{2.3}\quad{}Calculator\end{@norefs}}
-\tocitem \@locref{htoc6}{\begin{@norefs}\@print{2.4}\quad{}Calculator with Memory\end{@norefs}}
-\end{tocenv}
-\tocitem \@locref{htoc7}{\begin{@norefs}\@print{3}\quad{}Grammars\end{@norefs}}
-\begin{tocenv}
-\tocitem \@locref{htoc8}{\begin{@norefs}\@print{3.1}\quad{}Left Factoring\end{@norefs}}
-\tocitem \@locref{htoc9}{\begin{@norefs}\@print{3.2}\quad{}Left Recursion\end{@norefs}}
-\tocitem \@locref{htoc10}{\begin{@norefs}\@print{3.3}\quad{}Ambiguous Grammars\end{@norefs}}
-\end{tocenv}
-\tocitem \@locref{htoc11}{\begin{@norefs}\@print{4}\quad{}Customization\end{@norefs}}
-\begin{tocenv}
-\tocitem \@locref{htoc12}{\begin{@norefs}\@print{4.1}\quad{}Customizing Parsers\end{@norefs}}
-\tocitem \@locref{htoc13}{\begin{@norefs}\@print{4.2}\quad{}Customizing Scanners\end{@norefs}}
-\end{tocenv}
-\tocitem \@locref{htoc14}{\begin{@norefs}\@print{5}\quad{}Parser Mechanics\end{@norefs}}
-\begin{tocenv}
-\tocitem \@locref{htoc15}{\begin{@norefs}\@print{5.1}\quad{}Parser Objects\end{@norefs}}
-\tocitem \@locref{htoc16}{\begin{@norefs}\@print{5.2}\quad{}Context Sensitive Scanner\end{@norefs}}
-\tocitem \@locref{htoc17}{\begin{@norefs}\@print{5.3}\quad{}Internal Variables\end{@norefs}}
-\tocitem \@locref{htoc18}{\begin{@norefs}\@print{5.4}\quad{}Pre- and Post-Parser Code\end{@norefs}}
-\tocitem \@locref{htoc19}{\begin{@norefs}\@print{5.5}\quad{}Representation of Grammars\end{@norefs}}
-\end{tocenv}
-\tocitem \@locref{htoc20}{\begin{@norefs}\@print{A}\quad{}Grammar for Parsers\end{@norefs}}
-\tocitem \@locref{htoc21}{\begin{@norefs}\@print{B}\quad{}Upgrading\end{@norefs}}
-\tocitem \@locref{htoc22}{\begin{@norefs}\@print{C}\quad{}Troubleshooting\end{@norefs}}
-\tocitem \@locref{htoc23}{\begin{@norefs}\@print{D}\quad{}History\end{@norefs}}
-\tocitem \@locref{htoc24}{\begin{@norefs}\@print{E}\quad{}Debian Extensions\end{@norefs}}
-\tocitem \@locref{htoc25}{\begin{@norefs}\@print{F}\quad{}Future Extensions\end{@norefs}}
-\tocitem \@locref{htoc26}{\begin{@norefs}\@print{G}\quad{}References\end{@norefs}}
-\end{tocenv}

doc/yapps2.man

@@ -0,0 +1,35 @@
+.TH YAPPS2 1
+.SH NAME
+yapps2 \- generate python parser code from grammar description file
+.SH SYNOPSIS
+.B yapps2
+[\fB\-h\fR]
+[\fB\-i\fR, \fB\-\-context-insensitive-scanner\fR]
+[\fB\-t\fR, \fB\-\-indent-with-tabs\fR]
+[\fB\-\-dump\fR]
+.IR grammar_file [ parser_file ]
+.SH DESCRIPTION
+.B yapps2
+generates python parser code from a grammar description file.
+.SH OPTIONS
+.TP
+.BR \-h ", " \-\-help\fR
+show a help message and exit
+.TP
+.BR \-i ", " \-\-context-insensitive-scanner\fR
+Scan all tokens. See the documentation for details.
+.TP
+.BR \-t ", " \-\-indent-with-tabs\fR
+Use tabs instead of four spaces for indentation in generated code.
+.TP
+.BR \-\-dump\fR
+Dump out grammar information.
+.TP
+.BR grammar_file
+grammar description file (input)
+.TP
+.BR parser_file
+Name of the output file to be generated.
+.BR
+The grammar file's name, with .py appended, will be used, if omitted.
+\"-\" or \"/dev/stdout\" can be used to send generated code to stdout.