Need line directives ahead of the host blocks.

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

diff --git a/ragel/gendata.cpp b/ragel/gendata.cpp
index e0189c6..86e3d0d 100644 (file)
--- a/ragel/gendata.cpp
+++ b/ragel/gendata.cpp
@@ -722,7 +722,7 @@ void CodeGenData::writeStatement( InputLoc &loc, int nargs, char **args )
         * generators.
         *
         * Force a newline. */
-       out << "\n";
+       out << '\n';
        genLineDirective( out );
 
        if ( strcmp( args[0], "data" ) == 0 ) {

diff --git a/ragel/gendata.h b/ragel/gendata.h
index bc052d9..e454b53 100644 (file)
--- a/ragel/gendata.h
+++ b/ragel/gendata.h
@@ -72,6 +72,7 @@ void javaLineDirective( ostream &out, const char *fileName, int line );
 void rubyLineDirective( ostream &out, const char *fileName, int line );
 void csharpLineDirective( ostream &out, const char *fileName, int line );
 void genLineDirective( ostream &out );
+void lineDirective( ostream &out, const char *fileName, int line );
 
 /*********************************/
 

diff --git a/ragel/inputdata.cpp b/ragel/inputdata.cpp
index 1d52f34..5922a53 100644 (file)
--- a/ragel/inputdata.cpp
+++ b/ragel/inputdata.cpp
@@ -122,6 +122,8 @@ void InputData::writeOutput()
                        cgd->writeStatement( ii->loc, ii->writeArgs.length()-1, ii->writeArgs.data );
                }
                else {
+                       *outStream << '\n';
+                       lineDirective( *outStream, inputFileName, ii->loc.line );
                        *outStream << ii->data.str();
                }
        }