commit b1a6719aa600e2459ea954c6f92b2090c29c3d90
author Scott Wood <scottwood@freescale.com> Mon Jan 07 14:27:51 2008 -0600
committer Jon Loeliger <jdl@freescale.com> Thu Jan 10 07:43:33 2008 -0600
tree dd2d573291eb9de7b0abb069aa01cc9b2e3d6c5d
parent 42107f8bba994f718594dd670a937861d40f425d

Preserve scanner state when /include/ing.

This allows /include/s to work when in non-default states,
such as PROPNODECHAR.

We may want to use state stacks to get rid of BEGIN_DEFAULT() altogether...

Signed-off-by: Scott Wood <scottwood@freescale.com>

dtc-lexer.l

diff --git a/dtc-lexer.l b/dtc-lexer.l
index f2836a8..920b87f 100644
--- a/dtc-lexer.l
+++ b/dtc-lexer.l
@@ -18,7 +18,7 @@
  *                                                                   USA
  */
 
-%option noyywrap nounput yylineno
+%option noyywrap nounput yylineno stack
 
 %x INCLUDE
 %x BYTESTRING
@@ -55,7 +55,7 @@
 %}
 
 %%
-<*>"/include/"		BEGIN(INCLUDE);
+<*>"/include/"		yy_push_state(INCLUDE);
 
 <INCLUDE>\"[^"\n]*\"	{
 			yytext[strlen(yytext) - 1] = 0;
@@ -63,7 +63,7 @@
 				/* Some unrecoverable error.*/
 				exit(1);
 			}
-			BEGIN_DEFAULT();
+			yy_pop_state();
 		}