Commit 182bd7cd authored by Dimitri van Heesch's avatar Dimitri van Heesch
Browse files

Merge pull request #60 from albert-github/feature/bug_impure 

Fortran added keyword IMPURE
parents 87720321 38261ebe

src/fortrancode.l

+2 −2
Original line number Diff line number Diff line
@@ -684,14 +684,14 @@ CHAR (CHARACTER{ARGS}?|CHARACTER{BS}"*"({BS}[0-9]+|{ARGS})) 
TYPE_SPEC (({NUM_TYPE}({BS}"*"{BS}[0-9]+)?)|({NUM_TYPE}{KIND})|DOUBLE{BS_}COMPLEX|DOUBLE{BS_}PRECISION|{CHAR})



INTENT_SPEC intent{BS}"("{BS}(in|out|in{BS}out){BS}")"

ATTR_SPEC (IMPLICIT|ALLOCATABLE|DIMENSION{ARGS}|EXTERNAL|{INTENT_SPEC}|INTRINSIC|OPTIONAL|PARAMETER|POINTER|PROTECTED|PRIVATE|PUBLIC|SAVE|TARGET|RECURSIVE|PURE|ELEMENTAL)

ATTR_SPEC (IMPLICIT|ALLOCATABLE|DIMENSION{ARGS}|EXTERNAL|{INTENT_SPEC}|INTRINSIC|OPTIONAL|PARAMETER|POINTER|PROTECTED|PRIVATE|PUBLIC|SAVE|TARGET|RECURSIVE|PURE|IMPURE|ELEMENTAL)

ACCESS_SPEC (PROTECTED|PRIVATE|PUBLIC)

/* Assume that attribute statements are almost the same as attributes. */

ATTR_STMT {ATTR_SPEC}|DIMENSION

FLOW  (DO|SELECT|CASE|WHERE|IF|THEN|ELSE|WHILE|FORALL|ELSEWHERE|ELSEIF|RETURN|CONTINUE|EXIT)

COMMANDS  (FORMAT|CONTAINS|MODULE{BS_}PROCEDURE|WRITE|READ|ALLOCATE|ALLOCATED|ASSOCIATED|DEALLOCATE|SIZE|INQUIRE|OPEN|CLOSE|DATA|COMMON)

IGNORE (CALL)

PREFIX    (RECURSIVE{BS_}|PURE{BS_}|ELEMENTAL{BS_}){0,2}(RECURSIVE|PURE|ELEMENTAL)?

PREFIX    (RECURSIVE{BS_}|IMPURE{BS_}|PURE{BS_}|ELEMENTAL{BS_}){0,3}(RECURSIVE|IMPURE|PURE|ELEMENTAL)?



/* |  */

src/fortranscanner.l

+3 −3
Original line number Diff line number Diff line
@@ -265,7 +265,7 @@ LANGUAGE_BIND_SPEC BIND{BS}"("{BS}C{BS}(,{BS}NAME{BS}"="{BS}"\""(.*)"\""{BS})?") 
ATTR_STMT {ATTR_SPEC}|DIMENSION|{ACCESS_SPEC}



CONTAINS  CONTAINS

PREFIX    (RECURSIVE{BS_}|PURE{BS_}|ELEMENTAL{BS_}){0,2}(RECURSIVE|PURE|ELEMENTAL)?

PREFIX    (RECURSIVE{BS_}|IMPURE{BS_}|PURE{BS_}|ELEMENTAL{BS_}){0,3}(RECURSIVE|IMPURE|PURE|ELEMENTAL)?

SCOPENAME ({ID}{BS}"::"{BS})*



%option noyywrap
@@ -1170,11 +1170,11 @@ static void extractPrefix(QCString &text) 
  int prefixIndex = 0;

  int curIndex = 0;

  bool cont = TRUE;

  const char* pre[] = {"RECURSIVE","PURE","ELEMENTAL"};

  const char* pre[] = {"RECURSIVE","IMPURE","PURE","ELEMENTAL"};

  while(cont)

  {

    cont = FALSE;

    for(unsigned int i=0; i<3; i++)

    for(unsigned int i=0; i<4; i++)

    {

      if((prefixIndex=text.find(pre[i], curIndex, FALSE))==0)

      {