Changeset 1200 for trunk/AGRIF/LIB/fortran.lex

Timestamp:

2008-09-24T15:05:20+02:00 (16 years ago)

Author:

rblod

Message:

Adapt Agrif to the new SBC and correct several bugs for agrif (restart writing and reading), see ticket #133
Note : this fix does not work yet on NEC computerq (sxf90/360)

File:

• trunk/AGRIF/LIB/fortran.lex (modified) (11 diffs)

trunk/AGRIF/LIB/fortran.lex

@@ -36 +36 @@
 %s character
 %x donottreat
+%s fortran77style
+%s fortran90style
 %{
 #include <math.h>
@@ -70 +72 @@
            }\
            strcpy(motparse1,yytext);\
+           /*printf("yytext = %s\n",yytext);*/\
         /*if ( firstpass == 1 ) 
                       printf("yytext = %s %d\n",yytext,strlen(yytext));*/\
@@ -102 +105 @@
 NEXTLINEF77 \n[ \t]{5}("&"|"+"|"$"|"*"|"1"|"2"|"3"|"4"|"5"|"6"|"7"|"8"|"."|"#")
 %%
+  if (infixed) BEGIN(fortran77style) ;
+  if (infree) BEGIN(fortran90style)  ;
 
 ^C${AGRIFDEB}            return TOK_DEBUT;
@@ -111 +116 @@
 subroutine              {return TOK_SUBROUTINE;}
 program                 {return TOK_PROGRAM;}
-allocate                {return TOK_ALLOCATE;}
-deallocate              {return TOK_DEALLOCATE;}
+allocate                {inallocate = 1; return TOK_ALLOCATE;}
+deallocate              {inallocate = 1; return TOK_DEALLOCATE;}
 result                  {return TOK_RESULT;}
 function                {return TOK_FUNCTION;}
@@ -145 +150 @@
 \=\>                    {return TOK_POINT_TO;}
 \*\*                    {strcpy(yylval.na,yytext);return TOK_DASTER;}
+\.[ \t]*eqv\.            {strcpy(yylval.na,yytext);return TOK_EQV;}
 \.[ \t]*eq\.            {strcpy(yylval.na,yytext);return TOK_EQ;}
 \.[ \t]*gt\.            {strcpy(yylval.na,yytext);return TOK_GT;}
@@ -150 +156 @@
 \.[ \t]*lt\.            {strcpy(yylval.na,yytext);return TOK_LT;}
 \.[ \t]*le\.            {strcpy(yylval.na,yytext);return TOK_LE;}
+\.[ \t]*neqv\.          {strcpy(yylval.na,yytext);return TOK_NEQV;}
 \.[ \t]*ne\.            {strcpy(yylval.na,yytext);return TOK_NE;}
 \.[ \t]*not\.           {strcpy(yylval.na,yytext);return TOK_NOT;}
@@ -188 +195 @@
 ^[ \t]*type[ \t\,]+       {return TOK_TYPE;}
 ^[ \t]*type[ \t]*\(     {return TOK_TYPEPAR;}
-stat                    {return TOK_STAT;}
+stat                    {if (inallocate == 1) return TOK_STAT; else {strcpy(yylval.na,yytext);return TOK_NAME;}}
 end[ \t]*type           {return TOK_ENDTYPE;}
 open                     return TOK_OPEN;
@@ -228 +235 @@
 exist[ \t]*\=           {return TOK_EXIST;}
 min[ \t]*\(             {return TOK_MIN;}
-int                     {return TOK_INT;}
 nint                    {return TOK_NINT;}
 float                   {return TOK_FLOAT;}
@@ -271 +277 @@
 \'|\"                   {return TOK_QUOTE;}
 \.                      {}
-;|\(|\)|:|\[|\]|\+|\-|\*|\% {strcpy(yylval.na,yytext);return (int) *yytext;}
+\(|\)|:|\[|\]|\+|\-|\*|\% {strcpy(yylval.na,yytext);return (int) *yytext;}
+\;                      {return TOK_SEMICOLON;}
 \,                      {return (int) *yytext;}
-\;                      {return (int) *yytext;}
 \=                      {return (int) *yytext;}
 \<                      {return (int) *yytext;}
@@ -285 +291 @@
 {NEXTLINEF90}           {line_num_fortran++;line_num_fortran_common++;newlinef90=1;colnum=0;}
 {NEXTLINEF77}           {line_num_fortran++;line_num_fortran_common++;colnum=0;}
-{COMMENTAIRESFORTRAN77} {
+<fortran77style>{COMMENTAIRESFORTRAN77} {
                            convert2lower(motparse1);
                            if ( strncasecmp(motparse1,"contains",8) == 0 )
@@ -323 +329 @@
       printf("%s line %d, file %s\n",s,line_num_fortran_common,curfile);
    }
+   /*exit(0);*/
 }