From de4358f8d83dbc1c1d5f7403af0fe219eb31fb59 Mon Sep 17 00:00:00 2001
From: Wilson Snyder <wsnyder@wsnyder.org>
Date: Wed, 4 Jun 2008 14:44:59 +0000
Subject: [PATCH] Preproc: Fix syntax error when include defname is ifdefed.

git-svn-id: file://localhost/svn/verilator/trunk/verilator@1069 77ca24e4-aefa-0310-84f0-b9a241c72d87
---
 src/V3PreProc.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/V3PreProc.cpp b/src/V3PreProc.cpp
index a9dd65648..3d835ec97 100644
--- a/src/V3PreProc.cpp
+++ b/src/V3PreProc.cpp
@@ -812,14 +812,12 @@ int V3PreProcImp::getToken() {
 	case ps_INCNAME: {
 	    if (tok==VP_STRING) {
 		m_state = ps_TOP;
-		if (!m_off) {
-		    m_lastSym.assign(yytext,yyleng);
-		    UINFO(4,"Include "<<m_lastSym<<endl);
-		    // Drop leading and trailing quotes.
-		    m_lastSym.erase(0,1);
-		    m_lastSym.erase(m_lastSym.length()-1,1);
-		    include(m_lastSym);
-		}
+		m_lastSym.assign(yytext,yyleng);
+		UINFO(4,"Include "<<m_lastSym<<endl);
+		// Drop leading and trailing quotes.
+		m_lastSym.erase(0,1);
+		m_lastSym.erase(m_lastSym.length()-1,1);
+		include(m_lastSym);
 		goto next_tok;
 	    }
 	    else if (tok==VP_TEXT && yyleng==1 && yytext[0]=='<') {
@@ -858,7 +856,9 @@ int V3PreProcImp::getToken() {
 	// Default is to do top level expansion of some tokens
 	switch (tok) {
 	case VP_INCLUDE:
-	    m_state = ps_INCNAME;  m_stateFor = tok;
+	    if (!m_off) {
+		m_state = ps_INCNAME;  m_stateFor = tok;
+	    }
 	    goto next_tok;
 	case VP_UNDEF:
 	case VP_DEFINE: