Include the root in the include history.

git-svn-id: http://svn.complang.org/ragel/trunk@459 052ea7fc-9027-0410-9066-f65837a77df0

diff --git a/ragel/rlparse.kh b/ragel/rlparse.kh
index a829d78..0359c50 100644 (file)
--- a/ragel/rlparse.kh
+++ b/ragel/rlparse.kh
@@ -111,6 +111,8 @@ struct Parser
        {
                pd = new ParseData( fileName, sectionName, sectionLoc );
                exportContext.append( false );
+               includeHistory.append( IncludeHistoryItem( 
+                               fileName, sectionName ) );
        }
 
        int token( InputLoc &loc, int tokId, char *tokstart, int toklen );

diff --git a/ragel/rlscan.rl b/ragel/rlscan.rl
index d2d93a4..5a02105 100644 (file)
--- a/ragel/rlscan.rl
+++ b/ragel/rlscan.rl
@@ -246,6 +246,8 @@ ostream &Scanner::scan_error()
        return cerr;
 }
 
+/* An approximate check for duplicate includes. Due to aliasing of files it's
+ * possible for duplicates to creep in. */
 bool Scanner::duplicateInclude( char *inclFileName, char *inclSectionName )
 {
        for ( IncludeHistory::Iter hi = parser->includeHistory; hi.lte(); hi++ ) {