Commit aac81f8b authored by albert-github's avatar albert-github
Browse files

Bug 733856 - segfault in QGListIterator while parsing fortran code 

Problem with variables with the name type versus type definitions.
type followed by = is recognized as not being a type definition instead of the use of a variable.
parent c9d816aa

src/fortrancode.l

+2 −0
Original line number Original line Diff line number Diff line
@@ -1128,6 +1128,8 @@ PREFIX (RECURSIVE{BS_}|IMPURE{BS_}|PURE{BS_}|ELEMENTAL{BS_}){0,3}(RECURSIVE|I 
            }

            }

                                          YY_FTN_RESET

                                          YY_FTN_RESET

  					}

  					}

<*>^{BS}"type"{BS}"="                     { g_code->codify(yytext); }



<*>.					{ 

<*>.					{ 

  					  g_code->codify(yytext);

  					  g_code->codify(yytext);

					}

					}

src/fortranscanner.l

+1 −0
Original line number Original line Diff line number Diff line
@@ -739,6 +739,7 @@ private { 
{ID}	                               {

{ID}	                               {

                                       }  

                                       }  

^{BS}"type"{BS_}"is"/{BS_}             { }

^{BS}"type"{BS_}"is"/{BS_}             { }

^{BS}"type"{BS}"="                     { }

}

}

<AttributeList>{

<AttributeList>{

{COMMA}					{}

{COMMA}					{}