hpcchris/sit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

New patch for the empty line issue with Fortran in Scorep 2.0.0.

Browse source
This commit is contained in:
Christoph Niethammer 2016-08-11 14:59:30 +00:00
parent 024c69674f
commit ac1d66c880
1 changed files with 45 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

76
packages/performance/scorep/scorep-2.0.2-0001.patch
View file

@ -1,42 +1,56 @@
Index: src/opari/opari2_parser_f.cc
===================================================================
--- src/opari/opari2_parser_f.cc (revision 1748)
--- src/opari/opari2_parser_f.cc (revision 1749)
+++ src/opari/opari2_parser_f.cc (working copy)
@@ -304,6 +304,12 @@
return result;
}
@@ -763,11 +763,13 @@
lines.push_back( m_lowline );
+bool
+OPARI2_FortranParser::is_empty_line( void )
+{
+ return m_lowline.find_first_not_of( " \t" ) == string::npos;
+}
+
/**@brief check if this line is a comment line*/
bool
OPARI2_FortranParser::is_comment_line( void )
@@ -816,7 +822,7 @@
bool found_continuation_line;
- string prev_sentinel = m_sentinel;
- unsigned ignored_lines = 0;
+ bool last_was_continuation_line = false;
+ string prev_sentinel = m_sentinel;
+ unsigned ignored_lines = 0;
do
{
- found_continuation_line = false;
+ last_was_continuation_line = found_continuation_line;
+ found_continuation_line = false;
if ( m_options.form == F_FREE )
{
@@ -778,7 +780,7 @@
--com;
}
string::size_type amp = m_lowline.find_last_not_of( " \t", com );
- if ( m_lowline[ amp ] == '&' )
+ if ( m_lowline[ amp ] == '&' || ( is_empty_line() && last_was_continuation_line ) )
{
found_continuation_line = true;
}
@@ -822,8 +824,15 @@
found_continuation_line = true;
m_sentinel = prev_sentinel;
}
- else if ( found_continuation_line )
+ else if ( found_continuation_line && !is_empty_line() )
- else if ( found_continuation_line && !is_empty_line() )
+ else if ( is_empty_line() && last_was_continuation_line && m_options.form == F_FREE )
{
+ found_continuation_line = true;
+ lines.push_back( m_lowline );
+ m_sentinel = prev_sentinel;
+ ignored_lines--;
+ }
+ else if ( found_continuation_line )
+ {
cerr << m_curr_file << ":" << m_lineno - 1
<< ": ERROR: missing continuation line\n";
Index: src/opari/opari2_parser_f.h
===================================================================
--- src/opari/opari2_parser_f.h (revision 1748)
+++ src/opari/opari2_parser_f.h (working copy)
@@ -98,6 +98,10 @@
bool
is_sub_unit_header( void );
+/**@brief check if this line is empty*/
+ bool
+ is_empty_line( void );
+
/**@brief check if this line is a comment line*/
bool
is_comment_line( void );
cleanup_and_exit();
@@ -840,7 +849,6 @@
OPARI2_Directive* d_new =
NewDirective( lines, directive_prefix, m_options.lang, m_curr_file,
m_lineno - lines.size() - ignored_lines + 1 );
-
if ( d_new )
{
m_waitfor_loopstart = d_new->NeedsEndLoopDirective();