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

Timestamp:

2007-12-18T17:45:53+01:00 (17 years ago)

Author:

rblod

Message:

Update Agrif, see ticket:#39

File:

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

trunk/AGRIF/LIB/fortran.lex

@@ -31 +31 @@
 /* knowledge of the CeCILL-C license and that you accept its terms.           */
 /******************************************************************************/
-/* version 1.6                                                                */
+/* version 1.7                                                                */
 /******************************************************************************/
 %x parameter
 %s character
+%x donottreat
 %{
 #include <math.h>
@@ -62 +63 @@
            {\
               strcat(curbuf,yytext); \
+              Save_Length(curbuf,38); \
               strcpy(motparse,yytext);\
+              Save_Length(motparse,32); \
               colnum = colnum + strlen(motparse);\
-              /*printf("motparse = %s %d\n",motparse,strlen(motparse)); */\
               ECHO; \
            }\
@@ -199 +201 @@
 public                  {return TOK_PUBLIC;}
 private                 {return TOK_PRIVATE;}
-\([ \t]*in[ \t]*\)      {return TOK_IN;}
+in                      {strcpy(yylval.nac,yytext);return TOK_IN;}
 ^[ \t]*data[ \t]+       {strcpy(yylval.na,yytext);return TOK_DATA;}
 continue                 return TOK_CONTINUE;
 go[ \t]*to              {return TOK_PLAINGOTO;}
-\([ \t]*out[ \t]*\)     {return TOK_OUT;}
-\([ \t]*inout[ \t]*\)   {return TOK_INOUT;}
+out                     {strcpy(yylval.nac,yytext);return TOK_OUT;}
+inout                   {strcpy(yylval.nac,yytext);return TOK_INOUT;}
 intrinsic               {return TOK_INTRINSIC;}
 then                    {return TOK_THEN;}
@@ -296 +298 @@
                            }
                          }
+^"!$AGRIF_DO_NOT_TREAT\n" BEGIN(donottreat);
+<donottreat>^"!$AGRIF_END_DO_NOT_TREAT\n" BEGIN(INITIAL);
+<donottreat>.*\n
 {COMMENTAIRESFORTRAN90}   {
                              colnum = 0;
@@ -312 +317 @@
    if (!strcasecmp(curfile,mainfile))
    {
-      printf("%s line %d, fichier %s\n",s,line_num_fortran,curfile);
+      printf("%s line %d, file %s\n",s,line_num_fortran,curfile);
    }
    else
    {
-      printf("%s line %d, fichier %s\n",s,line_num_fortran_common,curfile);
+      printf("%s line %d, file %s\n",s,line_num_fortran_common,curfile);
    }
 }