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

1 files changed, 28 insertions, 4 deletions

diff --git a/epan/diam_dict.l b/epan/diam_dict.l
index 8ed7385172..e360672fa9 100644
--- a/epan/diam_dict.l
+++ b/epan/diam_dict.l
@@ -1,10 +1,34 @@
+/*
+ * 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
-%option prefix="DiamDict"
+
+/*
+ * The language we're scanning is case-insensitive.
+ */
 %option caseless
+
+/*
+ * We use start condition stacks.
+ */
 %option stack
 
+/*
+ * Prefix scanner routines with "DiamDict" rather than "yy", so this scanner
+ * can coexist with other scanners.
+ */
+%option prefix="DiamDict"
+
 %option outfile="diam_dict.c"
 
 %{
@@ -27,9 +51,9 @@
 	 ** Library General Public License for more details.
 	 **
 	 ** You should have received a copy of the GNU Library General Public
-	 ** License along with this library; if not, write to the
-	 ** Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-	 ** Boston, MA  02111-1307, USA.
+	 ** License along with this library; if not, write to the Free Software
+	 ** Foundation, Inc., 51 Franklin Street, Fifth Floor,
+	 ** Boston, MA  02110-1301, USA.
 	 */
 	
 #ifdef HAVE_CONFIG_H