Index: lm-sensors/branches/scanner-opt-branch/lib/conf-lex.l
===================================================================
--- lm-sensors/branches/scanner-opt-branch/lib/conf-lex.l	(revision 3300)
+++ lm-sensors/branches/scanner-opt-branch/lib/conf-lex.l	(revision 4122)
@@ -47,5 +47,5 @@
 %}
 
-/* Scanner for configuration files */
+ /* Scanner for configuration files */
 
 %option nodefault
@@ -54,22 +54,29 @@
 %option nounput
 
-/* States. 'Normal' states STRING and MIDDLE share some rules; other states
-   have only their own rules */
+ /*
+  * States. 'Normal' states STRING and MIDDLE share some rules;
+  * other states have only their own rules
+  */
+
 %s MIDDLE
 %x STRING
 %x ERR
 
-/* Any whitespace-like character */
+ /* Any whitespace-like character */
+
 BLANK		[[:space:]]
 
 IDCHAR		[[:alnum:]_]
 
-/* Note: `10', `10.4' and `.4' are valid, `10.' is not */
+ /* Note: `10', `10.4' and `.4' are valid, `10.' is not */
+
 FLOAT   [[:digit:]]*\.?[[:digit:]]+
 
-/* Only positive whole numbers are recognized here */
+ /* Only positive whole numbers are recognized here */
+
 NUM	0|([1-9][[:digit:]]*)
 
-/* Only number between 1 and 255, octally represented. */
+ /* Only number between 1 and 255, octally represented. */
+
 OCTESC		(1[0-7]{0,2})|([2-7][0-7]?)|(0[1-7][0-7]?)|(00[1-7])
 
@@ -79,4 +86,5 @@
 
  /* End of line: It may be the end of this line. Same for End of file. */
+
 <MIDDLE>\n	|
 <MIDDLE><<EOF>> {
@@ -85,16 +93,24 @@
 		}
 
- /* We want to match any blank, except End of line; that is why we have to
-    match whitespace one by one! */
+ /*
+  * We want to match any blank, except End of line; that is why we have to
+  * match whitespace one by one!
+  */
+
 {BLANK}		/* Eat up a blank */
 
  /* Escaped End of line: eat and be happy */
+
 <MIDDLE>\\\n	/* Eat this! */
 
- /* Remove a comment; we do not change the state, this is done when the \n is
-    eaten */
+ /*
+  * Remove a comment; we do not change the state,
+  * this is done when the \n is eaten
+  */
+
 #[^\n]*		/* Eat this! */
 
  /* Some keywords at the beginning of lines */
+
 <INITIAL>"label" {
 		  sensors_yylval.line = sensors_yylineno;
@@ -133,4 +149,5 @@
 
  /* Anything else at the beginning of a line is an error */
+
 <INITIAL>.	{
 		  yymore();
@@ -145,4 +162,5 @@
 
  /* A number */
+
 <MIDDLE>{FLOAT}	{
 		  sensors_yylval.value = atof(sensors_yytext);
@@ -151,41 +169,18 @@
 
  /* Some operators */
-<MIDDLE>"+"	{
-		  return '+';
-		}
-
-<MIDDLE>"-"	{
-		  return '-';
-		}
-
-<MIDDLE>"*"	{
-		  return '*';
-		}
-
-<MIDDLE>"/"	{
-		  return '/';
-		}
-
-<MIDDLE>"("	{
-		  return '(';
-		}
-
-<MIDDLE>")"	{
-		  return ')';
-		}
-<MIDDLE>","	{
-		  return ',';
-		}
-<MIDDLE>"@"	{
-		  return '@';
-		}
-<MIDDLE>"^"	{
-		  return '^';
-		}
-<MIDDLE>"`"	{
-		  return '`';
-		}
+
+<MIDDLE>"+"	return '+';
+<MIDDLE>"-"	return '-';
+<MIDDLE>"*"	return '*';
+<MIDDLE>"/"	return '/';
+<MIDDLE>"("	return '(';
+<MIDDLE>")"	return ')';
+<MIDDLE>","	return ',';
+<MIDDLE>"@"	return '@';
+<MIDDLE>"^"	return '^';
+<MIDDLE>"`"	return '`';
 
  /* Quoted string */
+
 <MIDDLE>\"	{
 		  buffer_malloc();
@@ -194,4 +189,5 @@
 
  /* Oops, newline while in a string is not good */
+
 <STRING>\n	|
 <STRING>\\\n	{
@@ -204,4 +200,5 @@
 
  /* At the end */
+
 <STRING>\"	{
 		  buffer_add_char("\0");
@@ -244,4 +241,5 @@
 
  /* We can't support \0, this would cause havoc! */
+
 <STRING>\\{OCTESC} {
 		  int res;
@@ -251,4 +249,5 @@
 
  /* Other escapes: just copy the character behind the slash */
+
 <STRING>\\.	{
 		  buffer_add_char(&sensors_yytext[1]);
@@ -256,4 +255,5 @@
 
  /* Anything else */
+
 <STRING>[^\\\n\"]+ {
 		  buffer_add_string(sensors_yytext);
@@ -261,4 +261,5 @@
 
  /* A normal, unquoted identifier */
+
 <MIDDLE>{IDCHAR}+ {
 		  sensors_yylval.name = strdup(sensors_yytext);