diff options
author | Guy Harris <guy@alum.mit.edu> | 2007-07-30 20:22:37 +0000 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2007-07-30 20:22:37 +0000 |
commit | 968d363f113c73885a4c6c67019b0b8a93bf2524 (patch) | |
tree | 9cbfb86dfe1b0a83c37e8528dc019ef3885e0733 /plugins | |
parent | 0d437580eed2149e0d313aa00a64c11a4df37633 (diff) |
Add comments to various %option items to explain what they're doing.
Move the %options to the beginning if they weren't already there, and
put them in the same order in all files.
Add "prefix=" options to .l files that don't already have them, so we
don't have to pass a "-P" option.
Add "never-interactive" and "noyywrap" options to our lexical analyzers,
to remove extra isatty() checks and to eliminate the need for yywrap()
from the Flex library.
Get rid of %option nostdinit - that's the default.
Add .l.c: rules to Makefile.am files, replacing the rules for specific
.l files. Have those rules all check that $(LEX) is set.
Update the address for the FSF.
svn path=/trunk/; revision=22424
Diffstat (limited to 'plugins')
-rw-r--r-- | plugins/mate/Makefile.am | 8 | ||||
-rw-r--r-- | plugins/mate/mate_parser.l | 18 |
2 files changed, 23 insertions, 3 deletions
diff --git a/plugins/mate/Makefile.am b/plugins/mate/Makefile.am index ac5037b5dd..fb8f258bb8 100644 --- a/plugins/mate/Makefile.am +++ b/plugins/mate/Makefile.am @@ -130,8 +130,12 @@ EXTRA_DIST = \ moduleinfo.nmake \ plugin.rc.in -mate_parser.c : mate_parser.l - $(LEX) -Pdf_ -omate_parser.c $(srcdir)/mate_parser.l +.l.c: + @if [ ! -x "$(LEX)" ]; then \ + echo "Neither lex nor flex was found"; \ + exit 1; \ + fi + $(LEX) -o$@ $< LEMON = ../../tools/lemon diff --git a/plugins/mate/mate_parser.l b/plugins/mate/mate_parser.l index aa4fdf3cf9..8d1089edee 100644 --- a/plugins/mate/mate_parser.l +++ b/plugins/mate/mate_parser.l @@ -1,6 +1,22 @@ +/* + * We want to stop processing when we get to the end of the input. + */ %option noyywrap + +/* + * We don't use unput, so don't generate code for it. + */ %option nounput + +/* + * We don't read from the terminal. + */ %option never-interactive + +/* + * Prefix scanner routines with "Mate" rather than "yy", so this scanner + * can coexist with other scanners. + */ %option prefix="Mate" %{ @@ -28,7 +44,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include "mate.h" |