Changeset 14107 for vendors/AGRIF/dev/LEX

Timestamp:

2020-12-04T18:02:20+01:00 (3 years ago)

Author:

nicolasmartin

Message:

Reintegration of dev_r12970_AGRIF_CMEMS to AGRIF/dev

Location:

vendors/AGRIF/dev/LEX

Files:

• Makefile.lex (modified) (2 diffs)
• convert.y (modified) (4 diffs)
• fortran.lex (modified) (8 diffs)
• fortran.y (modified) (48 diffs)

vendors/AGRIF/dev/LEX/Makefile.lex

@@ -1 +1 @@
 LEX      = flex -i
-YACC  = bison -t -v -g
+YACC  = /usr/bin/bison -t -v -g --graph
+#YACC = byacc -t -v
 
 all: main.c fortran.c
 
 main.c : convert.tab.c convert.yy.c
-   cat   convert.tab.c convert.yy.c > ../LIB/main.c
+   cat   convert.tab.c convert.yy.c > main.c
    $(RM) convert.tab.c convert.yy.c
 
 fortran.c : fortran.tab.c fortran.yy.c
-   cat   fortran.tab.c fortran.yy.c > ../LIB/fortran.c
+   cat   fortran.tab.c fortran.yy.c > fortran.c
    $(RM) fortran.tab.c fortran.yy.c
 
@@ -29 +30 @@
 
 clean-all: clean
-   $(RM) ../LIB/main.c ../LIB/fortran.c
+   $(RM) main.c fortran.c

vendors/AGRIF/dev/LEX/convert.y

@@ -130 +130 @@
     int infreegiven ;
     int infixedgiven ;
-    int lengthmainfile;
 
     char filetoparse[LONG_FNAME];
@@ -160 +159 @@
     tmpuselocallist = (listusemodule *) NULL;
     List_ContainsSubroutine = (listnom *) NULL;
+    List_Do_labels = (listname *) NULL;
     oldfortran_out = (FILE *) NULL;
 
-    if (argc < 2) print_usage();
-    
+    if ( argc < 2 )
+        print_usage();
+
     strcpy(config_file, argv[1]);
     strcpy(work_dir, ".");
@@ -257 +258 @@
             strcpy(filetoparse, argv[i+1]);
             i++;
-            lengthmainfile = strlen(filetoparse);
-            if (!strcasecmp(&filetoparse[lengthmainfile-4], ".f90"))
-            {
-                infixed = 0;
-                infree = 1;
-            }
-            else
-            {
-                infixed = 1;
-                infree = 0;
-            }
+            infree  = (strstr(filetoparse, ".f90") != NULL) || (strstr(filetoparse, ".F90") != NULL);
+            infixed = ! infree;
         }
         else if (!strcasecmp(argv[i], "-free"))
@@ -400 +392 @@
     /* Build new subroutines                                                   */
     firstpass = 0;
+    /*
+    printf("**********************************\n");
+    printf("SECOND PASSES \n");
+    printf("**********************************\n");
+    */
     process_fortran(filetoparse);
 

vendors/AGRIF/dev/LEX/fortran.lex

@@ -39 +39 @@
 %s character
 %x donottreat
+%x donottreat_interface
+%x includestate
 %s fortran77style
 %s fortran90style
@@ -47 +49 @@
 extern FILE * yyin;
 #define MAX_INCLUDE_DEPTH 30
+#define YY_BUF_SIZE 64000
 YY_BUFFER_STATE include_stack[MAX_INCLUDE_DEPTH];
-int line_num_input = 1;
+int line_num_input = 0;
 int newlinef90 = 0;
-char tmpc;
-#define PRINT_LINE_NUM()     // { fprintf(stderr,"== Parsing l.%4d...\n", line_num_input); }
-#define INCREMENT_LINE_NUM() { line_num_input++; PRINT_LINE_NUM(); }
-
-/******************************************************************************/
-/**************PETITS PB NON PREVUS *******************************************/
-/******************************************************************************/
-/* NEXTLINF77 un ligne fortran 77 peut commencer par -      &a=b or on        */
-/*            a prevu seulement       & a=b avec l'espace entre le symbole    */
-/*            de la 7eme et le debut de la ligne de commande                  */
-/*            le ! est aussi interdit comme symbole de la 7 eme colonne       */
-/*            Normalement NEXTLINEF77 \n+[ ]{5}[^ ]                           */
-/******************************************************************************/
-#define YY_USER_ACTION  if (firstpass == 0) ECHO;
+int tmpc;
+
+int lastwasendofstmt = 1;
+
+extern char linebuf1[1024];
+extern char linebuf2[1024];
+
+int count_newlines(const char* str_in)
+{
+    int k, i = 0;
+    for( k=0 ; k<strlen(str_in) ; k++)
+        if (str_in[k] == '\n') i++;
+    return i;
+}
+
+#define PRINT_LINE_NUM()   //  { fprintf(stderr,"== Parsing l.%4d...\n", line_num_input); }
+#define INCREMENT_LINE_NUM() { line_num_input+=count_newlines(fortran_text) ; PRINT_LINE_NUM(); }
+#define YY_USER_ACTION       { if (increment_nbtokens !=0) token_since_endofstmt++; increment_nbtokens = 1; if (token_since_endofstmt>=1) lastwasendofstmt=0; /*printf("VALLIJSDFLSD = %d %d %s \n",lastwasendofstmt,token_since_endofstmt,fortran_text); */ if (firstpass) { strcpy(linebuf1, linebuf2); strncpy(linebuf2, fortran_text,80);} \
+                               else {my_position_before=setposcur();/*printf("muposition = %d\n",my_position_before);*/ECHO;} }
+#define YY_BREAK {/*printf("VALL = %d %d\n",lastwasendofstmt,token_since_endofstmt);*/if (token_since_endofstmt>=1) lastwasendofstmt=0; break;}
 
 void out_of_donottreat(void);
@@ -69 +78 @@
 %}
 
-REAL8 "real*8"[ \t]*"(a-h,o-z)"
-
 SLASH       "/"
-DSLASH      "/"[ \t]*"/"
 HEXA        Z\'[0-9a-fA-F]+\'
-NAME        [a-zA-Z\_][a-zA-Z0-9\_]*
 INTEGER     [0-9]+
-
+NAME        [a-zA-Z][a-zA-Z0-9\_]*
 EXPONENT    [edq][-+]?{INTEGER}
 
-BEG_DNT         ^[C!]"$AGRIF_DO_NOT_TREAT"[ \t]*\n
-END_DNT         ^[C!]"$AGRIF_END_DO_NOT_TREAT"[ \t]*\n
+BEG_DNT         ^[C!]"$AGRIF_DO_NOT_TREAT"[ \t]*([ \t\n]*(!.*\n)*)+\n
+END_DNT         ^[C!]"$AGRIF_END_DO_NOT_TREAT"[ \t]*([ \t\n]*(!.*\n)*)+\n
 
 BEG_INTERFACE   ^[ \t]*interface
@@ -87 +92 @@
 ASSIGNTYPE      "assignment"[ \t]*"("[ \t]*[-+=]+[ \t]*")"
 
-COMM_F77        ^([Cc*](([ \t]*\n)|([^AaHhOo\n].*\n)))
-COMM_F90        ^[ \t]*!.*\n
+COMM_F77        ^[c*].*\n
+COMM_F90_1      ^([ \t\n]*(!.*\n)*)+\n
 COMM_F90_2      !.*
-NEXTLINEF90     "&".*\n+
-NEXTLINEF77     [\n \t]*\n[ \t]{5}("&"|"+"|"$"|"*"|"1"|"2"|"3"|"4"|"5"|"6"|"7"|"8"|"9"|"."|"#")
-
-LABEL           ^(((" "|[0-9]){1,5})|([ \t]{1,5}))[ &]+
+NEXTLINEF90     &([ \t\n]|(!.*\n))*
+NEXTLINEF77     \n(([c*].*\n)|(([ \t]{0,4}|[ \t]{6,})!.*\n)|[\n])*[ ]{5}([a-z0-9&+$*.#/!;])
+LABEL           ^[ 0-9]{1,5}[ \t]+
 
 %%
@@ -99 +103 @@
   if (infree)  BEGIN(fortran90style) ;
 
-{REAL8}                     { return TOK_REAL8; }
 subroutine                  { return TOK_SUBROUTINE; }
 program                     { return TOK_PROGRAM; }
 allocate                    { inallocate = 1; return TOK_ALLOCATE; }
+continue                    { return TOK_CONTINUE; }
 nullify                    { return TOK_NULLIFY; }
-null[ ]*\([ ]*\)            { return TOK_NULL_PTR; }
 deallocate                  { inallocate = 1; return TOK_DEALLOCATE; }
 result                      { return TOK_RESULT; }
 function                    { return TOK_FUNCTION; }
-end[ \t]*program            { strcpy(yylval.na,fortran_text); return TOK_ENDPROGRAM;}
-end[ \t]*module             { strcpy(yylval.na,fortran_text); return TOK_ENDMODULE; }
-end[ \t]*subroutine         { strcpy(yylval.na,fortran_text); return TOK_ENDSUBROUTINE;}
-end[ \t]*function           { strcpy(yylval.na,fortran_text); return TOK_ENDFUNCTION;}
 end                         { strcpy(yylval.na,fortran_text); return TOK_ENDUNIT;}
-include                     { pos_curinclude = setposcur()-9; return TOK_INCLUDE;}
-^[ \t]*use[ ]+              { strcpy(yylval.na,fortran_text);
-                              tmpc = (char) input(); unput(tmpc);
-                              if ( ( tmpc >= 'a' && tmpc <= 'z' ) ||
-                                   ( tmpc >= 'A' && tmpc <= 'Z' )  )  return TOK_USE;
-                              else                                    return TOK_NAME;
-                            }
+include                     { pos_curinclude = setposcur()-9; BEGIN(includestate); }
+use                         { return TOK_USE;}
 rewind                      { return TOK_REWIND; }
 implicit                    { return TOK_IMPLICIT; }
 none                        { return TOK_NONE; }
 call                        { return TOK_CALL; }
-.true.                      { return TOK_TRUE; }
-.false.                     { return TOK_FALSE; }
+.true.                      { strcpy(yylval.na,fortran_text); return TOK_TRUE; }
+.false.                     { strcpy(yylval.na,fortran_text); return TOK_FALSE; }
 \=\>                        { return TOK_POINT_TO; }
 {ASSIGNTYPE}                { strcpy(yylval.na,fortran_text); return TOK_ASSIGNTYPE;}
 \*\*                        { strcpy(yylval.na,fortran_text); return TOK_DASTER; }
-\.[ \t]*eqv\.               { strcpy(yylval.na,fortran_text); return TOK_EQV; }
-\.[ \t]*eq\.                { strcpy(yylval.na,fortran_text); return TOK_EQ;  }
-\.[ \t]*gt\.                { strcpy(yylval.na,fortran_text); return TOK_GT;  }
-\.[ \t]*ge\.                { strcpy(yylval.na,fortran_text); return TOK_GE;  }
-\.[ \t]*lt\.                { strcpy(yylval.na,fortran_text); return TOK_LT;  }
-\.[ \t]*le\.                { strcpy(yylval.na,fortran_text); return TOK_LE;  }
-\.[ \t]*neqv\.              { strcpy(yylval.na,fortran_text); return TOK_NEQV;}
-\.[ \t]*ne\.                { strcpy(yylval.na,fortran_text); return TOK_NE;  }
-\.[ \t]*not\.               { strcpy(yylval.na,fortran_text); return TOK_NOT; }
-\.[ \t]*or\.                { strcpy(yylval.na,fortran_text); return TOK_OR;  }
+\.eqv\.               { strcpy(yylval.na,fortran_text); return TOK_EQV; }
+\.[ \t]*eq[ \t]*\.                { strcpy(yylval.na,fortran_text); return TOK_EQ;  }
+\.gt\.                { strcpy(yylval.na,fortran_text); return TOK_GT;  }
+\.ge\.                { strcpy(yylval.na,fortran_text); return TOK_GE;  }
+\.lt\.                { strcpy(yylval.na,fortran_text); return TOK_LT;  }
+\.le\.                { strcpy(yylval.na,fortran_text); return TOK_LE;  }
+\.neqv\.              { strcpy(yylval.na,fortran_text); return TOK_NEQV;}
+\.[ \t]*ne[ \t]*\.                { strcpy(yylval.na,fortran_text); return TOK_NE;  }
+\.not\.               { strcpy(yylval.na,fortran_text); return TOK_NOT; }
+\.or\.                { strcpy(yylval.na,fortran_text); return TOK_OR;  }
 \.[ \t]*xor\.               { strcpy(yylval.na,fortran_text); return TOK_XOR; }
-\.[ \t]*and\.               { strcpy(yylval.na,fortran_text); return TOK_AND; }
+\.and\.               { strcpy(yylval.na,fortran_text); return TOK_AND; }
+\=\=                  { strcpy(yylval.na,fortran_text); return TOK_EQUALEQUAL; }
+\/\=                  { strcpy(yylval.na,fortran_text); return TOK_SLASHEQUAL; }
+\<\=                  { strcpy(yylval.na,fortran_text); return TOK_INFEQUAL; }
+\>\=                  { strcpy(yylval.na,fortran_text); return TOK_SUPEQUAL; }
 module                      { return TOK_MODULE; }
 while                       { return TOK_WHILE; }
 concurrent                  { return TOK_CONCURRENT; }
 end[ \t]*do                 { return TOK_ENDDO; }
-do                          { return TOK_PLAINDO;}
+do[\ t]+{INTEGER}           { strcpy(yylval.na,&fortran_text[2]);
+                              if (testandextractfromlist(&List_Do_labels,&fortran_text[2]) == 1)
+                              {
+                              return TOK_PLAINDO_LABEL_DJVIEW;
+                              }
+                              else
+                              {
+                              List_Do_labels=Insertname(List_Do_labels,yylval.na,1);
+                              return TOK_PLAINDO_LABEL;
+                             }
+                             }
+do                          { increment_nbtokens = 0; return TOK_PLAINDO;}
 real                        { strcpy(yylval.na,fortran_text); return TOK_REAL; }
 integer                     { strcpy(yylval.na,fortran_text); return TOK_INTEGER; }
@@ -153 +162 @@
 double[ \t]*precision       { strcpy(yylval.na,fortran_text); return TOK_DOUBLEPRECISION; }
 double[ \t]*complex         { strcpy(yylval.na,fortran_text); return TOK_DOUBLECOMPLEX; }
-complex                     { return TOK_COMPLEX; }
+complex                     { strcpy(yylval.na,fortran_text); return TOK_COMPLEX; }
 allocatable                 { return TOK_ALLOCATABLE; }
 close                       { return TOK_CLOSE; }
@@ -172 +181 @@
 ^[ \t]*global[ \t]+         { return TOK_GLOBAL; }
 external                    { return TOK_EXTERNAL; }
-intent                      { return TOK_INTENT; }
+intent                      { intent_spec = 1; return TOK_INTENT; }
 pointer                     { return TOK_POINTER; }
 optional                    { return TOK_OPTIONAL; }
 save                        { return TOK_SAVE; }
-^[ \t]*type[ \t]*\(         { pos_cur_decl = setposcur()-5; return TOK_TYPEPAR; }
-^[ \t]*type[ \t\,]+         { return TOK_TYPE; }
+^[ \t]*type[ \t]*\(         { pos_cur_decl = setposcur()-strlen(fortran_text); return TOK_TYPEPAR; }
+^[ \t]*type/[ \t\,:]+       { return TOK_TYPE; }
 end[ \t]*type               { return TOK_ENDTYPE; }
 stat                        { if (inallocate == 1) return TOK_STAT; else { strcpy(yylval.na,fortran_text); return TOK_NAME; } }
 open                        { return TOK_OPEN; }
 return                      { return TOK_RETURN; }
-exit[^(]                    { return TOK_EXIT; }
+exit                        { return TOK_EXIT; }
 print                       { return TOK_PRINT; }
 module[ \t]*procedure       { return TOK_PROCEDURE; }
+read[ \t]*\(                { in_io_control_spec = 1; return TOK_READ_PAR; }
 read                        { return TOK_READ; }
 namelist                    { return TOK_NAMELIST; }
+write[ \t]*\(               { in_io_control_spec = 1; return TOK_WRITE_PAR; }
 write                       { return TOK_WRITE; }
-flush                       { return TOK_FLUSH; }
+flush                       { strcpy(yylval.na,fortran_text); return TOK_FLUSH; }
 target                      { return TOK_TARGET; }
 public                      { return TOK_PUBLIC; }
 private                     { return TOK_PRIVATE; }
-in                          { strcpy(yylval.na,fortran_text); return TOK_IN; }
-^[ \t]*data[ \t]+           { pos_curdata = setposcur()-strlen(fortran_text); Init_List_Data_Var(); return TOK_DATA; }
-continue                    { return TOK_CONTINUE; }
+in                          { strcpy(yylval.na,fortran_text);
+                               if (intent_spec==1)
+                                {return TOK_IN; }
+                              else
+                              {
+                              return TOK_NAME;
+                              }
+                            }
+^[ \t]*data[ \t]+           { pos_curdata = setposcur()-strlen(fortran_text); /*Init_List_Data_Var();*/ return TOK_DATA; }
 go[ \t]*to                  { return TOK_PLAINGOTO; }
-out                         { strcpy(yylval.na,fortran_text); return TOK_OUT; }
-inout                       { strcpy(yylval.na,fortran_text); return TOK_INOUT; }
+out                         { strcpy(yylval.na,fortran_text);
+                               if (intent_spec==1)
+                                {return TOK_OUT; }
+                              else
+                              {
+                              return TOK_NAME;
+                              }
+                            }
+inout                       { strcpy(yylval.na,fortran_text);
+                               if (intent_spec==1)
+                                {return TOK_IN; }
+                              else
+                              {
+                              return TOK_INOUT;
+                              }
+                            }
 intrinsic                   { return TOK_INTRINSIC; }
 then                        { return TOK_THEN; }
@@ -203 +234 @@
 else                        { return TOK_ELSE; }
 end[ \t]*if                 { return TOK_ENDIF; }
-if                          { return TOK_LOGICALIF; }
-sum[ \t]*\(                 { return TOK_SUM; }
-max[ \t]*\(                 { return TOK_MAX; }
-tanh                        { return TOK_TANH; }
-maxval                      { return TOK_MAXVAL; }
-trim                        { return TOK_TRIM; }
-sqrt\(                      { return TOK_SQRT; }
+if[ \t]*\(/(.*\)[ \t]*[\=|\+|\-]+.*\))   {strcpy(yylval.na,fortran_text);
+                            return TOK_LOGICALIF_PAR;
+                            }
+if/([ \t]*\([^(]*\)[ \t]*[\=|\+|\-]+)   {strcpy(yylval.na,fortran_text);
+                            return TOK_NAME;
+                            }
+if[ \t]*\(                 {strcpy(yylval.na,fortran_text);
+                            return TOK_LOGICALIF_PAR;
+                            }
 select[ \t]*case            { return TOK_SELECTCASE; }
-^[ \t]*case[ \t]*           { return TOK_CASE; }
+^[ \t]*case[ \t]*           { if (in_select_case_stmt > 0) return TOK_CASE ; else return TOK_NAME;}
 default                     { return TOK_DEFAULT; }
 end[ \t]*select             { return TOK_ENDSELECT; }
 file[ \t]*\=                { return TOK_FILE; }
+access[ \t]*\=                { return TOK_ACCESS; }
+action[ \t]*\=                { return TOK_ACTION; }
+iolength[ \t]*\=                { return TOK_IOLENGTH; }
 unit[ \t]*\=                { return TOK_UNIT; }
+opened[ \t]*\=                { return TOK_OPENED; }
 fmt[ \t]*\=                 { return TOK_FMT; }
 nml[ \t]*\=                 { return TOK_NML; }
 end[ \t]*\=                 { return TOK_END; }
 eor[ \t]*\=                 { return TOK_EOR; }
+len/([ \t]*\=)                 {
+                            if (in_char_selector ==1)
+                               return TOK_LEN;
+                            else
+                            {
+                            strcpy(yylval.na,fortran_text); return TOK_NAME;
+                            }
+                            }
+kind/([ \t]*\=)            {
+                            if ((in_char_selector==1) || (in_kind_selector == 1))
+                               return TOK_KIND;
+                            else
+                            {
+                            strcpy(yylval.na,fortran_text); return TOK_NAME;
+                            }
+                            }
+errmsg[ \t]*\=              { return TOK_ERRMSG; }
+mold[ \t]*\=              { return TOK_MOLD; }
+source[ \t]*\=              { return TOK_SOURCE; }
+position[ \t]*\=            { return TOK_POSITION; }
+iomsg[ \t]*\=               { return TOK_IOMSG; }
+iostat[ \t]*\=              { return TOK_IOSTAT; }
 err[ \t]*\=                 { return TOK_ERR; }
+form[ \t]*\=                { return TOK_FORM; }
+name/([ \t]*\=)             {
+                            if (in_inquire==1)
+                               return TOK_NAME_EQ;
+                            else
+                            {
+                            strcpy(yylval.na,fortran_text); return TOK_NAME;
+                            }
+                            }
+recl[ \t]*\=                { return TOK_RECL; }
+rec/([ \t]*\=)              { if (in_io_control_spec == 1)
+                              return TOK_REC;
+                             else
+                             {
+                             strcpy(yylval.na,fortran_text); return TOK_NAME;
+                             }
+                             }
+status/([ \t]*\=)           { if (close_or_connect == 1)
+                              return TOK_STATUS;
+                             else
+                             {
+                             strcpy(yylval.na,fortran_text); return TOK_NAME;
+                             }
+                             }
+status                      { strcpy(yylval.na,fortran_text); return TOK_NAME;}
 exist[ \t]*\=               { return TOK_EXIST; }
-min[ \t]*\(                 { return TOK_MIN; }
-nint                        { return TOK_NINT; }
-float                       { return TOK_FLOAT; }
-exp                         { return TOK_EXP; }
-cos                         { return TOK_COS; }
-cosh                        { return TOK_COSH; }
-acos                        { return TOK_ACOS; }
-sin                         { return TOK_SIN; }
-sinh                        { return TOK_SINH; }
-asin                        { return TOK_ASIN; }
-log                         { return TOK_LOG; }
-tan                         { return TOK_TAN; }
-atan                        { return TOK_ATAN; }
 cycle                       { return TOK_CYCLE; }
-abs[ \t]*\(                 { return TOK_ABS; }
-mod                         { return TOK_MOD; }
-sign[ \t]*\(                { return TOK_SIGN; }
-minloc                      { return TOK_MINLOC; }
-maxloc                      { return TOK_MAXLOC; }
-minval                      { return TOK_MINVAL; }
 backspace                   { return TOK_BACKSPACE; }
 ::                          { return TOK_FOURDOTS;  }
+\/[ \t]*({NEXTLINEF90}|{NEXTLINEF77})*[ \t]*\/  { strcpy(yylval.na,fortran_text); return TOK_DSLASH; }
 \({SLASH}                   { return TOK_LEFTAB; }
 {SLASH}\)                   { return TOK_RIGHTAB; }
-format[ \t]*\((.|{NEXTLINEF90}|{NEXTLINEF77})*\)  {
-                              return TOK_FORMAT; }
 {SLASH}                     { strcpy(yylval.na,fortran_text); return TOK_SLASH; }
-DSLASH                      { strcpy(yylval.na,fortran_text); return TOK_DSLASH; }
-(\')[^']*&{0,1}\n[ \t]*&{0,1}[^']*(\') {
-                              strcpy(yylval.na,fortran_text); return TOK_CHAR_CUT; }
-(\')[^']*(\')             { strcpy(yylval.na,fortran_text);return TOK_CHAR_CONSTANT; }
-(\")[^"]*(\")             { strcpy(yylval.na,fortran_text);return TOK_CHAR_MESSAGE; }
-{BEG_INTERFACE}             { BEGIN(donottreat); }
-<donottreat>{END_INTERFACE} { out_of_donottreat(); return '\n'; }
+((\')[^']*&{0,1}\n[ \t]*&{0,1}[^']*(\'))+ {
+                              INCREMENT_LINE_NUM() ; strcpy(yylval.na,fortran_text); return TOK_CHAR_CUT; }
+<includestate>((\')[^']*(\'))+ {Add_Include_1(fortran_text);}
+<includestate>[ \t]* {}
+<includestate>\n {
+                  if (inmoduledeclare == 0 )
+                  {
+                  pos_end=setposcur();
+                  RemoveWordSET_0(fortran_out,pos_curinclude,pos_end-pos_curinclude);
+                  }
+                  out_of_donottreat();
+                  }
+((\')[^']*(\'))+               { strcpy(yylval.na,fortran_text);return TOK_CHAR_CONSTANT; }
+((\")[^"]*(\"))+               { strcpy(yylval.na,fortran_text);return TOK_CHAR_MESSAGE; }
+{BEG_INTERFACE}             { BEGIN(donottreat_interface); }
+<donottreat_interface>{END_INTERFACE} { out_of_donottreat(); return '\n'; }
+<donottreat_interface>.*\n            {INCREMENT_LINE_NUM() ; }
+<fortran77style>{NAME}{NEXTLINEF77}[a-zA-Z0-9\_]+ {strcpy(yylval.na,fortran_text); removenewline(yylval.na);
+                            return TOK_NAME; }
 {NAME}                      { strcpy(yylval.na,fortran_text); return TOK_NAME; }
+{INTEGER}\.[0-9]+           {strcpy(yylval.na,fortran_text); return TOK_CSTREAL; }
 ({INTEGER}\.[0-9]*)/[^"and."|"false."|"true."|"eq."|"or."|"gt."|"ge."|"lt."|"le."|"not."|"ne."] {  // REAL1
                               strcpy(yylval.na,fortran_text); return TOK_CSTREAL; }
 (({INTEGER}\.[0-9]+|[0-9]*\.{INTEGER}){EXPONENT}?)|{INTEGER}(\.)?{EXPONENT}                     {  // REAL2
                               strcpy(yylval.na,fortran_text); return TOK_CSTREAL; }
-{INTEGER}                   { strcpy(yylval.na,fortran_text); return TOK_CSTINT; }
+{INTEGER}                   { strcpy(yylval.na,fortran_text);
+                             if (lastwasendofstmt == 0)
+                              return TOK_CSTINT;
+                             else
+                              if (testandextractfromlist(&List_Do_labels,fortran_text) == 1)
+                              {
+                              removefromlist(&List_Do_labels,yylval.na);
+                              return TOK_LABEL_DJVIEW;
+                              }
+                              else
+                              {
+                              return TOK_LABEL;
+                              }
+                             }
 \$                          {}
 \.                          {}
-\(|\)|:|\[|\]|\+|\-|\*      { strcpy(yylval.na,fortran_text); return (int) *fortran_text; }
+\(/([ \t]*[\+\-]?[a-zA-Z0-9]+[\.]*[0-9]*(\_({INTEGER}|{NAME}))?[ \t]*\,[ \t]*[\+\-]?[a-zA-Z0-9]+[\.]*[0-9]*(\_({INTEGER}|{NAME}))?[ \t]*\)) {
+                            in_complex_literal = -1;
+                            return (int) *fortran_text;
+                            }
+\(|\)|:|\[|\]|\+|\-|\*|\_   { strcpy(yylval.na,fortran_text); return (int) *fortran_text; }
 \%                          { strcpy(yylval.na,fortran_text); return (int) *fortran_text; }
-\;                          { return TOK_SEMICOLON; }
-\,                          { return (int) *fortran_text; }
+\;                          { lastwasendofstmt=1; token_since_endofstmt = 0; return TOK_SEMICOLON; }
+\,                          { if (in_complex_literal==-1) {return TOK_COMMACOMPLEX; in_complex_literal=0;} else; return (int) *fortran_text; }
 \=                          { return (int) *fortran_text; }
 \<                          { return (int) *fortran_text; }
 \>                          { return (int) *fortran_text; }
-\n                          { INCREMENT_LINE_NUM() ; return '\n'; }
-^[ ]*$                      {}
-[ \t]+                      {}
-{LABEL}                     { if (newlinef90 == 0) return TOK_LABEL; else newlinef90 = 0; }
+\n                          { INCREMENT_LINE_NUM() ; lastwasendofstmt=1; token_since_endofstmt = 0; increment_nbtokens = 0; return '\n'; }
+[ \t]+                      {increment_nbtokens = 0;}
+<fortran77style>{LABEL}[ \t]*format[ \t]*\((.|{NEXTLINEF90}|{NEXTLINEF77})*\)  {
+                              return TOK_LABEL_FORMAT; }
+<fortran90style>^[ \t]*{INTEGER}[ \t]*format[ \t]*\((.|{NEXTLINEF90})*\) {return TOK_LABEL_FORMAT; }
 {NEXTLINEF90}               { INCREMENT_LINE_NUM() ; newlinef90=1; }
-{NEXTLINEF77}               { INCREMENT_LINE_NUM() ; }
-
-{BEG_DNT}                   { INCREMENT_LINE_NUM() ; BEGIN(donottreat); }
-<donottreat>{END_DNT}       { out_of_donottreat(); return '\n'; }
-<donottreat>.*\n            { INCREMENT_LINE_NUM() ; }
-<fortran77style>{COMM_F77}  { INCREMENT_LINE_NUM() ; }
-{COMM_F90}                  { INCREMENT_LINE_NUM() ; }
-{COMM_F90_2}                {}
+<fortran77style>{NEXTLINEF77}               { INCREMENT_LINE_NUM() ;}
+
+{BEG_DNT}                   {INCREMENT_LINE_NUM() ; BEGIN(donottreat); }
+<donottreat>{END_DNT}       {out_of_donottreat(); return '\n'; }
+<donottreat>.*\n            {INCREMENT_LINE_NUM() ; }
+<fortran77style>{COMM_F77}  {INCREMENT_LINE_NUM() ; increment_nbtokens = 0;}
+{COMM_F90_1}                {INCREMENT_LINE_NUM() ; increment_nbtokens = 0;}
+{COMM_F90_2}                {increment_nbtokens = 0;}
+<<EOF>>                     {endoffile = 1; yyterminate();}
 %%
 

vendors/AGRIF/dev/LEX/fortran.y

@@ -42 +42 @@
 
 extern int line_num_input;
-extern char *fortran_text;
 
 char c_selectorname[LONG_M];
@@ -50 +49 @@
 int c_selectorgiven=0;
 listvar *curlistvar;
+int in_select_case_stmt=0;
 typedim c_selectordim;
 listcouple *coupletmp;
 int removeline=0;
+int token_since_endofstmt = 0;
+int increment_nbtokens = 1;
+int in_complex_literal = 0;
+int close_or_connect = 0;
+int in_io_control_spec = 0;
+int intent_spec = 0;
+long int my_position;
+long int my_position_before;
+int suborfun = 0;
+int indeclaration = 0;
+int endoffile = 0;
+int in_inquire = 0;
+int in_char_selector = 0;
+int in_kind_selector =0;
+int char_length_toreset = 0;
+
+typedim my_dim;
+
 listvar *test;
+
+char linebuf1[1024];
+char linebuf2[1024];
 
 int fortran_error(const char *s)
 {
-    printf("%s line %d, file %s motclef = |%s|\n", s, line_num_input, cur_filename, fortran_text);
+  if (endoffile == 1) 
+  {
+  endoffile = 0;
+  return 0;
+  }
+    printf("%s line %d, file %s culprit = |%s|\n", s, line_num_input, cur_filename, strcat(linebuf1, linebuf2));
     exit(1);
 }
@@ -94 +120 @@
 %token TOK_PROGRAM
 %token TOK_FUNCTION
-%token TOK_FORMAT
+%token TOK_LABEL_FORMAT
+%token TOK_LABEL_CONTINUE
+%token TOK_LABEL_END_DO
 %token TOK_MAX
 %token TOK_TANH
+%token TOK_COMMENT
 %token TOK_WHERE
 %token TOK_ELSEWHEREPAR
@@ -109 +138 @@
 %token TOK_SELECTCASE
 %token TOK_FILE
+%token TOK_REC
+%token TOK_NAME_EQ
+%token TOK_IOLENGTH
+%token TOK_ACCESS
+%token TOK_ACTION
+%token TOK_FORM
+%token TOK_RECL
+%token TOK_STATUS
 %token TOK_UNIT
+%token TOK_OPENED
 %token TOK_FMT
 %token TOK_NML
 %token TOK_END
 %token TOK_EOR
+%token TOK_EOF
 %token TOK_ERR
+%token TOK_POSITION
+%token TOK_IOSTAT
+%token TOK_IOMSG
 %token TOK_EXIST
 %token TOK_MIN
 %token TOK_FLOAT
 %token TOK_EXP
+%token TOK_LEN
 %token TOK_COS
 %token TOK_COSH
@@ -139 +182 @@
 %token TOK_MAXLOC
 %token TOK_EXIT
+%token TOK_KIND
+%token TOK_MOLD
+%token TOK_SOURCE
+%token TOK_ERRMSG
 %token TOK_MINVAL
 %token TOK_PUBLIC
@@ -150 +197 @@
 %token TOK_PRINT
 %token TOK_PLAINGOTO
-%token TOK_LOGICALIF
+%token <na> TOK_LOGICALIF
+%token <na> TOK_LOGICALIF_PAR
 %token TOK_PLAINDO
 %token TOK_CONTAINS
@@ -162 +210 @@
 %token TOK_CLOSE
 %token TOK_INQUIRE
+%token TOK_WRITE_PAR
 %token TOK_WRITE
-%token TOK_FLUSH
+%token <na> TOK_FLUSH
+%token TOK_READ_PAR
 %token TOK_READ
 %token TOK_REWIND
@@ -192 +242 @@
 %token TOK_PROCEDURE
 %token TOK_STOP
-%token TOK_REAL8
 %token TOK_FOURDOTS
 %token <na> TOK_HEXA
@@ -214 +263 @@
 %token <na> TOK_NOT
 %token <na> TOK_AND
+%token <na> TOK_EQUALEQUAL
+%token <na> TOK_SLASHEQUAL
+%token <na> TOK_INFEQUAL
+%token <na> TOK_SUPEQUAL
 %token <na> TOK_TRUE
 %token <na> TOK_FALSE
 %token <na> TOK_LABEL
+%token <na> TOK_LABEL_DJVIEW
+%token <na> TOK_PLAINDO_LABEL_DJVIEW
+%token <na> TOK_PLAINDO_LABEL
 %token <na> TOK_TYPE
 %token <na> TOK_TYPEPAR
 %token <na> TOK_ENDTYPE
+%token TOK_COMMACOMPLEX
 %token <na> TOK_REAL
 %token <na> TOK_INTEGER
@@ -246 +303 @@
 %token '>'
 %type <l> dcl
-%type <l> after_type
 %type <l> dimension
+%type <l> array-name-spec-list
 %type <l> paramlist
 %type <l> args
+%type <na> declaration-type-spec
 %type <l> arglist
 %type <lc> only_list
+%type <lc> only-list
+%type <lc> opt-only-list
+%type <lc> only
 %type <lc> only_name
-%type <lc> rename_list
-%type <lc> rename_name
+%type <lc> rename-list
+%type <lc> opt-rename-list
+%type <lc> rename
 %type <d> dims
 %type <d> dimlist
@@ -261 +323 @@
 %type <na> comblock
 %type <na> name_routine
+%type <na> type-param-value
 %type <na> opt_name
+%type <na> constant-expr
+%type <na> ac-implied-do
+%type <na> subroutine-name
+%type <l> opt-dummy-arg-list-par
+%type <l> opt-dummy-arg-list
+%type <l> dummy-arg-list
+%type <l> named-constant-def-list
+%type <v> named-constant-def
+%type <na> ac-do-variable
+%type <na> data-i-do-variable
+%type <na> data-stmt-constant
+%type <na> do-variable
+%type <na> ac-implied-do-control
+%type <na> label
+%type <na> opt-label
+%type <na> label-djview
+%type <na> opt-label-djview
 %type <na> type
-%type <na> word_endsubroutine
-%type <na> word_endfunction
-%type <na> word_endprogram
-%type <na> word_endunit
+%type <na> real-literal-constant
+%type <l> type-declaration-stmt
+%type <d> array-spec
+%type <d> assumed-shape-spec-list
+%type <d> deferred-shape-spec-list
+%type <d> assumed-size-spec
+%type <d> implied-shape-spec-list
 %type <na> typespec
+%type <na> null-init
+%type <na> initial-data-target
+%type <na> intent-spec
 %type <na> string_constant
+%type <na> access-id
+%type <na> dummy-arg-name
+%type <na> common-block-name
+%type <na> function-name
+%type <na> dummy-arg
+%type <na> lower-bound
+%type <na> upper-bound
+%type <na> scalar-constant-subobject
+%type <na> opt-data-stmt-star
 %type <na> simple_const
+%type <na> opt-char-selector
+%type <na> char-selector
 %type <na> ident
 %type <na> intent_spec
+%type <na> kind-param
 %type <na> signe
+%type <na> scalar-int-constant-expr
 %type <na> opt_signe
+%type <dim1> explicit-shape-spec
+%type <d> explicit-shape-spec-list
+%type <dim1> assumed-shape-spec
+%type <dim1> deferred-shape-spec
 %type <na> filename
 %type <na> attribute
@@ -279 +382 @@
 %type <na> begin_array
 %type <na> clause
+%type <na> only-use-name
+%type <na> generic-spec
 %type <na> arg
+%type <d> opt-array-spec-par
+%type <d> opt-explicit-shape-spec-list-comma
+%type <d> explicit-shape-spec-list-comma
 %type <na> uexpr
+%type <na> section_subscript_ambiguous
 %type <na> minmaxlist
+%type <na> subscript
+%type <na> subscript-triplet
+%type <na> vector-subscript
 %type <na> lhs
-%type <na> vec
 %type <na> outlist
 %type <na> other
+%type <na> int-constant-expr
 %type <na> dospec
 %type <na> expr_data
@@ -298 +410 @@
 %type <na> opt_expr
 %type <na> optexpr
+%type <v> entity-decl
+%type <l> entity-decl-list
 %type <lnn> data_stmt_value_list
+%type <lnn> data-stmt-value-list
+%type <lnn> access-id-list
+%type <lnn> opt-access-id-list
+%type <na> data-stmt-value
+%type <l> data-stmt-object-list
+%type <l> data-i-do-object-list
+%type <v> data-stmt-object
+%type <v> data-i-do-object
 %type <lnn> datanamelist
 %type <na> after_slash
 %type <na> after_equal
 %type <na> predefinedfunction
+%type <na> equiv-op
+%type <na> or-op
+%type <na> and-op
+%type <na> not-op
+%type <na> equiv-operand
+%type <na> or-operand
+%type <na> and-operand
+%type <na> mult-operand
+%type <na> rel-op
+%type <na> concat-op
+%type <na> add-operand
+%type <na> add-op
+%type <na> power-op
+%type <na> section-subscript-list
+%type <na> opt-lower-bound-2points
+%type <na> mult-op
+%type <na> array-constructor
 %type <na> expr
+%type <na> function-reference
+%type <na> literal-constant
+%type <na> named-constant
+%type <na> ac-value-list
+%type <na> ac-value
+%type <na> intrinsic-type-spec
+%type <na> opt-kind-selector
+%type <na> char-literal-constant
+%type <na> logical-literal-constant
+%type <na> real-part
+%type <na> imag-part
+%type <na> sign
+%type <na> signed-int-literal-constant
+%type <na> int-literal-constant
+%type <na> signed-real-literal-constant
+%type <na> complex-literal-constant
+%type <na> actual-arg-spec-list
+%type <na> procedure-designator
+%type <na> constant
+%type <na> data-ref
+%type <v> structure-component
+%type <v> scalar-structure-component
+%type <na> int-expr
+%type <na> ac-spec
+%type <na> type-spec
+%type <na> derived-type-spec
+%type <v> part-ref
+%type <na> opt-part-ref
+%type <na> actual-arg-spec
+%type <na> kind-selector
+%type <na> actual-arg
+%type <na> section-subscript
+%type <na> keyword
+%type <na> primary
+%type <na> specification-expr
+%type <v> variable
+%type <v> data-implied-do
+%type <na> substring-range
+%type <v> designator
+%type <na> object-name
+%type <na> object-name-noident
+%type <na> array-element
+%type <na> array-section
+%type <na> scalar-variable-name
+%type <na> scalar-constant
+%type <na> variable-name
+%type <na> opt-subscript 
+%type <na> stride
+%type <na> opt-scalar-int-expr
+%type <na> scalar-int-expr
+%type <na> level-1-expr
+%type <na> level-2-expr
+%type <na> level-3-expr
+%type <na> level-4-expr
+%type <na> level-5-expr
 %type <na> ubound
 %type <na> operation
@@ -311 +505 @@
 
 %%
-input :
+/* R201 : program */
+/*program: line-break
+     | program-unit
+     | program program-unit
+     ;
+*/
+
+input:
       | input line
       ;
-line :  line-break
+line:  line-break
       | suite_line_list
-      | TOK_LABEL suite_line_list
       | error {yyerrok;yyclearin;}
       ;
-line-break:
-        '\n' fin_line
+line-break: '\n' fin_line
+      {token_since_endofstmt = 0; increment_nbtokens = 0;}
       | TOK_SEMICOLON
+      | TOK_EOF
       | line-break '\n' fin_line
       | line-break TOK_SEMICOLON
-      | line-break TOK_LABEL
       ;
 suite_line_list :
@@ -331 +531 @@
       | suite_line_list TOK_SEMICOLON suite_line
       ;
-suite_line :
-        entry fin_line     /* subroutine, function, module                    */
-      | spec fin_line      /* declaration                                     */
+suite_line:program-unit
       | TOK_INCLUDE filename fin_line
         {
@@ -342 +540 @@
             }
         }
+      | TOK_COMMENT
+      ;
+/*
+suite_line:
+        entry fin_line     subroutine, function, module                    
+      | spec fin_line       declaration                                     
+      | TOK_INCLUDE filename fin_line
+        {
+            if (inmoduledeclare == 0 )
+            {
+                pos_end = setposcur();
+                RemoveWordSET_0(fortran_out,pos_curinclude,pos_end-pos_curinclude);
+            }
+        }
       | execution-part-construct
       ;
-
-fin_line : { pos_cur = setposcur(); }
-      ;
-
+*/
+
+fin_line: { pos_cur = setposcur(); }
+      ;
+
+/* R202 : program-unit */
+program-unit: main-program
+     | external-subprogram
+     | module
+     ;
+ 
+/*R203 : external-subprogram */
+external-subprogram: function-subprogram
+     | subroutine-subprogram
+     ;
+     
 opt_recursive :         { isrecursive = 0; }
       | TOK_RECURSIVE   { isrecursive = 1; }
@@ -356 +580 @@
       ;
 
-entry : opt_recursive TOK_SUBROUTINE name_routine arglist
-        {
-            insubroutinedeclare = 1;
-            if ( firstpass )
-                Add_SubroutineArgument_Var_1($4);
-            else
-                WriteBeginof_SubLoop();
-        }
-      | TOK_PROGRAM name_routine
-        {
-            insubroutinedeclare = 1;
-            inprogramdeclare = 1;
-            /* in the second step we should write the head of       */
-            /*    the subroutine sub_loop_<subroutinename>          */
-            if ( ! firstpass )
-                WriteBeginof_SubLoop();
-        }
-      | opt_recursive TOK_FUNCTION name_routine arglist opt_result
-        {
-            insubroutinedeclare = 1;
-            strcpy(DeclType, "");
-            /* we should to list of the subroutine argument the  */
-            /*    name of the function which has to be defined   */
-            if ( firstpass )
-            {
-                Add_SubroutineArgument_Var_1($4);
-                if ( ! is_result_present )
-                    Add_FunctionType_Var_1($3);
-            }
-            else
-            /* in the second step we should write the head of    */
-            /*    the subroutine sub_loop_<subroutinename>       */
-                WriteBeginof_SubLoop();
-        }
-      | TOK_MODULE TOK_NAME
-        {
-            GlobalDeclaration = 0;
-            strcpy(curmodulename,$2);
-            strcpy(subroutinename,"");
-            Add_NameOfModule_1($2);
-            if ( inmoduledeclare == 0 )
-            {
-                /* To know if there are in the module declaration    */
-                inmoduledeclare = 1;
-                /* to know if a module has been met                  */
-                inmodulemeet = 1;
-                /* to know if we are after the keyword contains      */
-                aftercontainsdeclare = 0 ;
-            }
-        }
-      ;
-
-/* R312 : label */
-label: TOK_CSTINT
-     | label TOK_CSTINT
-     ;
-
 name_routine :  TOK_NAME    { strcpy($$, $1); strcpy(subroutinename, $1); }
       ;
@@ -419 +586 @@
 arglist :               { if ( firstpass ) $$=NULL; }
       | '(' ')'         { if ( firstpass ) $$=NULL; }
-      | '(' args ')'    { if ( firstpass ) $$=$2; }
+      | '(' {in_complex_literal=0;} args ')'    { if ( firstpass ) $$=$3; }
       ;
 arglist_after_result:
       | '(' ')'
-      | '(' args ')'    { if ( firstpass ) Add_SubroutineArgument_Var_1($2); }
+      | '(' {in_complex_literal=0;} args ')'    { if ( firstpass ) Add_SubroutineArgument_Var_1($3); }
       ;
 args :  arg
@@ -452 +619 @@
       | '*'     { strcpy($$,"*"); }
       ;
-spec :  type after_type
-      | TOK_TYPE opt_spec opt_sep opt_name  { inside_type_declare = 1; }
-      | TOK_ENDTYPE opt_name                { inside_type_declare = 0; }
-      | TOK_POINTER list_couple
-      | before_parameter '(' paramlist ')'
-        {
-            if ( ! inside_type_declare )
-            {
-                if ( firstpass )
-                {
-                    if ( insubroutinedeclare )  Add_Parameter_Var_1($3);
-                    else                        Add_GlobalParameter_Var_1($3);
-                }
-                else
-                {
-                    pos_end = setposcur();
-                    RemoveWordSET_0(fortran_out, pos_cur_decl, pos_end-pos_cur_decl);
-                }
-            }
-            VariableIsParameter =  0 ;
-        }
-      | before_parameter paramlist
-        {
-            if ( ! inside_type_declare )
-            {
-                if ( firstpass )
-                {
-                    if ( insubroutinedeclare )  Add_Parameter_Var_1($2);
-                    else                        Add_GlobalParameter_Var_1($2);
-                }
-                else
-                {
-                    pos_end = setposcur();
-                    RemoveWordSET_0(fortran_out,pos_cur_decl,pos_end-pos_cur_decl);
-                }
-            }
-            VariableIsParameter =  0 ;
-        }
-      | common
-      | save
-        {
-            pos_end = setposcur();
-            RemoveWordSET_0(fortran_out,pos_cursave,pos_end-pos_cursave);
-        }
-      | implicit
-      | dimension
-        {
-            /* if the variable is a parameter we can suppose that is   */
-            /*    value is the same on each grid. It is not useless to */
-            /*    create a copy of it on each grid                     */
-            if ( ! inside_type_declare )
-            {
-                if ( firstpass )
-                {
-                    Add_Globliste_1($1);
-                    /* if variableparamlists has been declared in a subroutine   */
-                    if ( insubroutinedeclare )     Add_Dimension_Var_1($1);
-                }
-                else
-                {
-                    pos_end = setposcur();
-                    RemoveWordSET_0(fortran_out,pos_curdimension,pos_end-pos_curdimension);
-                }
-            }
-            PublicDeclare = 0;
-            PrivateDeclare = 0;
-            ExternalDeclare = 0;
-            strcpy(NamePrecision,"");
-            c_star = 0;
-            InitialValueGiven = 0 ;
-            strcpy(IntentSpec,"");
-            VariableIsParameter =  0 ;
-            Allocatabledeclare = 0 ;
-            Targetdeclare = 0 ;
-            SaveDeclare = 0;
-            pointerdeclare = 0;
-            optionaldeclare = 0 ;
-            dimsgiven=0;
-            c_selectorgiven=0;
-            strcpy(nameinttypename,"");
-            strcpy(c_selectorname,"");
-        }
-      | public
-        {
-            if (firstpass == 0)
-            {
-                if ($1)
-                {
-                    removeglobfromlist(&($1));
-                    pos_end = setposcur();
-                    RemoveWordSET_0(fortran_out,pos_cur,pos_end-pos_cur);
-                    writelistpublic($1);
-                }
-            }
-        }
-      | private
-      | use_stat
-      | module_proc_stmt
-      | namelist
-      | TOK_BACKSPACE '(' expr ')'
-      | TOK_EXTERNAL opt_sep use_name_list
-      | TOK_INTRINSIC opt_sep use_intrinsic_list
-      | TOK_EQUIVALENCE list_expr_equi
-      | data_stmt '\n'
-        {
-            /* we should remove the data declaration                */
-            pos_end = setposcur();
-            RemoveWordSET_0(fortran_out,pos_curdata,pos_end-pos_curdata);
-
-            if ( aftercontainsdeclare == 1  && firstpass == 0 )
-            {
-                ReWriteDataStatement_0(fortran_out);
-                pos_end = setposcur();
-            }
-        }
-      ;
+
 opt_spec :
       | access_spec
@@ -619 +671 @@
       | list_expr_equi1 ',' ident dims
       ;
-list_expr :
+list_expr:
                       expr
       | list_expr ',' expr
       ;
-opt_sep :
+opt_sep:
       | TOK_FOURDOTS
       ;
-after_type :
-        dcl nodimsgiven
-        {
-            /* if the variable is a parameter we can suppose that is*/
-            /*    value is the same on each grid. It is not useless */
-            /*    to create a copy of it on each grid               */
-            if ( ! inside_type_declare )
-            {
-                pos_end = setposcur();
-                RemoveWordSET_0(fortran_out,pos_cur_decl,pos_end-pos_cur_decl);
-                ReWriteDeclarationAndAddTosubroutine_01($1);
-                pos_cur_decl = setposcur();
-                if ( firstpass == 0 && GlobalDeclaration == 0
-                                    && insubroutinedeclare == 0 )
-                {
-                    fprintf(fortran_out,"\n#include \"Module_Declar_%s.h\"\n", curmodulename);
-                    sprintf(ligne, "Module_Declar_%s.h", curmodulename);
-                    module_declar = open_for_write(ligne);
-                    GlobalDeclaration = 1 ;
-                    pos_cur_decl = setposcur();
-                }
-                $$ = $1;
-
-                if ( firstpass )
-                {
-                    Add_Globliste_1($1);
-                    if ( insubroutinedeclare )
-                    {
-                        if ( pointerdeclare ) Add_Pointer_Var_From_List_1($1);
-                        Add_Parameter_Var_1($1);
-                    }
-                    else
-                        Add_GlobalParameter_Var_1($1);
-
-                    /* If there's a SAVE declaration in module's subroutines we should    */
-                    /*    remove it from the subroutines declaration and add it in the    */
-                    /*    global declarations                                             */
-                    if ( aftercontainsdeclare && SaveDeclare )
-                    {
-                        if ( inmodulemeet ) Add_SubroutineDeclarationSave_Var_1($1);
-                        else                Add_Save_Var_dcl_1($1);
-                    }
-                }
-            }
-            else
-            {
-                $$ = (listvar *) NULL;
-            }
-            PublicDeclare = 0;
-            PrivateDeclare = 0;
-            ExternalDeclare = 0;
-            strcpy(NamePrecision,"");
-            c_star = 0;
-            InitialValueGiven = 0 ;
-            strcpy(IntentSpec,"");
-            VariableIsParameter =  0 ;
-            Allocatabledeclare = 0 ;
-            Targetdeclare = 0 ;
-            SaveDeclare = 0;
-            pointerdeclare = 0;
-            optionaldeclare = 0 ;
-            dimsgiven=0;
-            c_selectorgiven=0;
-            strcpy(nameinttypename,"");
-            strcpy(c_selectorname,"");
-            GlobalDeclarationType = 0;
-        }
-      | before_function name_routine arglist
-        {
-            insubroutinedeclare = 1;
-
-            if ( firstpass )
-            {
-                Add_SubroutineArgument_Var_1($3);
-                Add_FunctionType_Var_1($2);
-            }
-            else
-                WriteBeginof_SubLoop();
-
-            strcpy(nameinttypename,"");
-        }
-      ;
+
 before_function :   TOK_FUNCTION    { functiondeclarationisdone = 1; }
       ;
-before_parameter :  TOK_PARAMETER   { VariableIsParameter = 1; pos_curparameter = setposcur()-9; }
+before_parameter :  TOK_PARAMETER   {VariableIsParameter = 1; pos_curparameter = setposcur()-9; }
       ;
 
@@ -750 +721 @@
       ;
 
-save :  before_save varsave
+save:  before_save varsave
       | before_save comblock varsave
       | save opt_comma comblock opt_comma varsave
       | save ',' varsave
       ;
-before_save :
+before_save:
         TOK_SAVE        { pos_cursave = setposcur()-4; }
       ;
@@ -896 +867 @@
             strcpy(curvar->v_subroutinename,subroutinename);
             strcpy(curvar->v_modulename,curmodulename);
-            strcpy(curvar->v_initialvalue,$3);
+            curvar->v_initialvalue=Insertname(curvar->v_initialvalue,$3,0);
             strcpy(curvar->v_commoninfile,cur_filename);
             Save_Length($3,14);
@@ -919 +890 @@
             }
         }
-      | TOK_IMPLICIT TOK_REAL8
-      ;
-dcl :   options TOK_NAME dims lengspec initial_value
+      ;
+dcl:   options TOK_NAME dims lengspec initial_value
         {
             if ( ! inside_type_declare )
@@ -970 +940 @@
 nodimsgiven : { dimsgiven = 0; }
       ;
-type :  typespec selector               { strcpy(DeclType,$1);  }
+type:  typespec selector               { strcpy(DeclType,$1);}
       | before_character c_selector     { strcpy(DeclType,"character");  }
       | typespec '*' TOK_CSTINT         { strcpy(DeclType,$1); strcpy(nameinttypename,$3);  }
@@ -993 +963 @@
       | TOK_COMPLEX         { strcpy($$,"complex"); pos_cur_decl = setposcur()-7; }
       | TOK_DOUBLECOMPLEX   { strcpy($$,"double complex"); pos_cur_decl = setposcur()-14; }
-      | TOK_DOUBLEPRECISION { pos_cur_decl = setposcur()-16; strcpy($$,"real"); strcpy(nameinttypename,"8"); }
+      | TOK_DOUBLEPRECISION { pos_cur_decl = setposcur()-16; strcpy($$,"real"); strcpy(nameinttypename,"8"); printf("OK1\n");}
       ;
 lengspec :
@@ -1033 +1003 @@
       | ',' TOK_NAME clause
       ;
-options :
+options:
       | TOK_FOURDOTS
       | ',' attr_spec_list TOK_FOURDOTS
       ;
-attr_spec_list : attr_spec
+attr_spec_list: attr_spec
       | attr_spec_list ',' attr_spec
       ;
@@ -1047 +1017 @@
       | TOK_EXTERNAL        { ExternalDeclare = 1; }
       | TOK_INTENT '(' intent_spec ')'
-                            { strcpy(IntentSpec,$3); }
+                            { strcpy(IntentSpec,$3); intent_spec = 0;}
       | TOK_INTRINSIC
       | TOK_OPTIONAL        { optionaldeclare = 1 ; }
@@ -1064 +1034 @@
       ;
 dims :  { $$ = (listdim*) NULL; }
-      | '(' dimlist ')'
+      | '(' {in_complex_literal=0;} dimlist ')'
         {
             $$ = (listdim*) NULL;
             if ( inside_type_declare ) break;
-            if ( created_dimensionlist == 1 || agrif_parentcall == 1 )  $$=$2;
+            if ( created_dimensionlist == 1 || agrif_parentcall == 1 )  $$=$3;
         }
       ;
@@ -1095 +1065 @@
       | expr                { strcpy($$,$1);  }
       ;
-expr :  uexpr               { strcpy($$,$1); }
+/*
+expr:  uexpr               { strcpy($$,$1); }
       | complex_const       { strcpy($$,$1); }
       | predefinedfunction  { strcpy($$,$1); }
       | '(' expr ')'        { sprintf($$,"(%s)",$2); }
       ;
-
+*/
 predefinedfunction :
         TOK_SUM minmaxlist ')'          { sprintf($$,"SUM(%s)",$2);}
@@ -1134 +1105 @@
 uexpr : lhs                     { strcpy($$,$1); }
       | simple_const            { strcpy($$,$1); }
-      | vec                     { strcpy($$,$1); }
       | expr operation          { sprintf($$,"%s%s",$1,$2); }
       | signe expr %prec '*'    { sprintf($$,"%s%s",$1,$2); }
@@ -1195 +1165 @@
         begin_array                                         { strcpy($$,$1); if ( incalldeclare == 0 ) inagrifcallargument = 0;   }
       | begin_array substring                               { sprintf($$," %s %s ",$1,$2); }
-      | structure_component '(' funarglist ')'              { sprintf($$," %s ( %s )",$1,$3); }
-      | structure_component '(' funarglist ')' substring    { sprintf($$," %s ( %s ) %s ",$1,$3,$5); }
-      ;
-begin_array :
-        ident '(' funarglist ')'
+      | structure_component '(' {in_complex_literal=0;} funarglist ')'              { sprintf($$," %s ( %s )",$1,$4); }
+      | structure_component '(' {in_complex_literal=0;} funarglist ')' substring    { sprintf($$," %s ( %s ) %s ",$1,$4,$6); }
+      ;
+begin_array : TOK_LOGICALIF
+      |  ident '(' {in_complex_literal=0;} funarglist ')'
         {
             if ( inside_type_declare ) break;
-            sprintf($$," %s ( %s )",$1,$3);
-            ModifyTheAgrifFunction_0($3);
+            sprintf($$," %s ( %s )",$1,$4);
+            ModifyTheAgrifFunction_0($4);
             agrif_parentcall = 0;
         }
@@ -1214 +1184 @@
         }
       ;
+/*
 vec :
         TOK_LEFTAB outlist TOK_RIGHTAB   { sprintf($$,"(/%s/)",$2); }
       ;
+*/
 funarglist :
         beforefunctionuse           { strcpy($$," "); }
@@ -1238 +1210 @@
       | ':'                     {  sprintf($$,":");}
       ;
-ident : TOK_NAME
-        {
+ident: TOK_NAME
+        {
+       //  if (indeclaration == 1) break;
             if ( afterpercent == 0 )
             {
@@ -1303 +1276 @@
       | substring   { strcpy($$,$1);}
       ;
+/*
 substring :
         '(' optexpr ':' optexpr ')' { sprintf($$,"(%s :%s)",$2,$4);}
       ;
+*/
 optexpr :           { strcpy($$," ");}
       | expr        { strcpy($$,$1);}
       ;
-opt_expr :
-        '\n'        { strcpy($$," ");}
+opt_expr :          { strcpy($$," ");}
       | expr        { strcpy($$,$1);}
       ;
-initial_value :     { InitialValueGiven = 0; }
+initial_value:     { InitialValueGiven = 0; }
       | '=' expr
         {
@@ -1330 +1304 @@
         '(' uexpr ',' uexpr ')' {sprintf($$,"(%s,%s)",$2,$4); }
       ;
-use_stat :
-        word_use TOK_NAME
-        {
-            /* if variables has been declared in a subroutine       */
-            sprintf(charusemodule, "%s", $2);
-            if ( firstpass )
-            {
-                Add_NameOfModuleUsed_1($2);
+
+only_list :
+        only_name   {  $$ = $1; }
+      | only_list ',' only_name
+        {
+            /* insert the variable in the list $1                 */
+            $3->suiv = $1;
+            $$ = $3;
+        }
+      ;
+only_name :
+        TOK_NAME TOK_POINT_TO TOK_NAME
+        {
+            coupletmp = (listcouple *)calloc(1,sizeof(listcouple));
+            strcpy(coupletmp->c_namevar,$1);
+            strcpy(coupletmp->c_namepointedvar,$3);
+            coupletmp->suiv = NULL;
+            $$ = coupletmp;
+            pointedvar = 1;
+            Add_UsedInSubroutine_Var_1($1);
+        }
+      | TOK_NAME
+        {
+            coupletmp = (listcouple *)calloc(1,sizeof(listcouple));
+            strcpy(coupletmp->c_namevar,$1);
+            strcpy(coupletmp->c_namepointedvar,"");
+            coupletmp->suiv = NULL;
+            $$ = coupletmp;
+        }
+      ;
+
+/* R204 : specification-part */
+/* opt-implicit-part removed but implicit-stmt and format-stmt added to declaration-construct */
+specification-part: opt-use-stmt-list opt-declaration-construct-list
+     ;
+
+opt-use-stmt-list:
+     |use-stmt-list
+     ;
+     
+opt-implicit-part:
+     |implicit-part
+     ;
+
+implicit-part: opt-implicit-part-stmt-list implicit-stmt
+     ;
+     
+opt-implicit-part-stmt-list:
+     | implicit-part-stmt-list
+     ;
+     
+implicit-part-stmt-list: implicit-part-stmt
+     | implicit-part-stmt-list implicit-part-stmt
+     ;
+     
+/* R206: implicit-part-stmt */
+implicit-part-stmt: implicit-stmt
+     | parameter-stmt
+     | format-stmt
+     ;
+
+
+opt-declaration-construct-list:
+     |declaration-construct-list
+     ;
+     
+declaration-construct-list:
+        declaration-construct
+      | declaration-construct-list declaration-construct
+      ;
+     
+/* R207 : declaration-construct */
+/* stmt-function-stmt replaced by assignment-stmt due to reduce conflicts */
+/* because assignment-stmt has been added  */
+/* Every statement that begins with a variable should be added */
+/* This include : */
+/* pointer-assignment-stmt, do-construct */
+/* implicit-stmt and format-stmt added since implicit-part-stmt has been removed due to conflicts (see R204) */
+/* ANOTHER SOLUTION TO THE PROBLEM OF STMT-FUNCTION IS NEEDED !!!! */
+/* BECAUSE ALMOST ALL ACTION-STMT SHOULD BE INCLUDED HERE !!! */
+
+declaration-construct: derived-type-def
+     | parameter-stmt
+     | format-stmt
+     | implicit-stmt
+     | other-specification-stmt
+     | type-declaration-stmt
+     | assignment-stmt
+     | pointer-assignment-stmt
+     | do-construct
+     | if-construct
+     | continue-stmt
+     | return-stmt
+     | print-stmt
+     ;
+
+opt-execution-part:
+     | execution-part
+     ;
+
+/* R208 : execution-part */
+execution-part: executable-construct opt-execution-part-construct-list
+     ;
+
+opt-execution-part-construct-list:
+     |execution-part-construct-list
+     ;
+
+execution-part-construct-list:
+        execution-part-construct
+      | execution-part-construct-list execution-part-construct
+      ;
+
+/* R209 : execution-part-construct */
+execution-part-construct: executable-construct
+      | format-stmt
+      ;
+
+opt-internal-subprogram-part:
+     | internal-subprogram-part
+     ;
+     
+/* R120 : internal-subprogram-part */
+internal-subprogram-part: TOK_CONTAINS line-break
+      opt-internal-subprogram
+     ;
+
+opt-internal-subprogram:
+     | internal-subprogram-list
+     ;
+
+internal-subprogram-list: internal-subprogram
+     | internal-subprogram-list internal-subprogram
+     ;
+
+/* R211 : internal-subprogram */
+internal-subprogram: function-subprogram
+     | subroutine-subprogram
+     ;
+
+/* R212 : other-specification-stmt */
+other-specification-stmt: access-stmt
+     | common-stmt
+     | data-stmt
+     | dimension-stmt
+     | equivalence-stmt
+     | external-stmt
+     | intrinsic-stmt
+     | namelist-stmt
+     | save-stmt
+     ;
+
+/* R213 : executable-construct */
+executable-construct:
+        action-stmt
+      | do-construct
+      | case-construct
+      | if-construct
+      | where-construct
+      ;
+
+/* R214 : action-stmt */
+
+/* normal action-stmt */
+
+action-stmt:
+      allocate-stmt
+      | assignment-stmt
+      | call-stmt
+      | close-stmt
+      | continue-stmt
+      | cycle-stmt
+      | deallocate-stmt
+      | goto-stmt
+      | exit-stmt
+      | flush-stmt
+      | TOK_CYCLE opt_expr
+      | TOK_NULLIFY '(' pointer_name_list ')'
+      | TOK_ENDMODULE opt_name
+        {
+            /* if we never meet the contains keyword               */
+            if ( firstpass == 0 )
+            {
+                RemoveWordCUR_0(fortran_out, strlen($2)+11);    // Remove word "end module"
+                if ( inmoduledeclare && ! aftercontainsdeclare )
+                {
+                    Write_Closing_Module(1);
+                }
+                fprintf(fortran_out,"\n      end module %s\n", curmodulename);
+                if ( module_declar && insubroutinedeclare == 0 )
+                {
+                    fclose(module_declar);
+                }
+            }
+            inmoduledeclare = 0 ;
+            inmodulemeet = 0 ;
+            aftercontainsdeclare = 1;
+            strcpy(curmodulename, "");
+            GlobalDeclaration = 0 ;
+        }
+      | if-stmt
+      | inquire-stmt
+      | open-stmt
+      | pointer-assignment-stmt
+      | print-stmt
+      | read-stmt
+      | return-stmt
+      | rewind-stmt
+      | stop-stmt
+      | where-stmt
+      | write-stmt
+      | arithmetic-if-stmt
+      ;
+
+/* R215 : keyword */
+keyword: ident
+     ;
+
+scalar-constant: constant
+    ;
+
+/* R304 : constant */
+
+constant: literal-constant
+     | named-constant
+     ;
+     
+/* R305 : literal-constant */
+literal-constant: int-literal-constant
+     | real-literal-constant
+     | logical-literal-constant
+     | complex-literal-constant
+     {in_complex_literal=0;}
+     | char-literal-constant
+     ;
+     
+/* R306 : named-constant */
+named-constant: ident
+     ;
+
+scalar-int-constant:int-constant
+     ;
+
+/* R307 : int-constant */
+int-constant: int-literal-constant
+     | named-constant
+     ;
+     
+/*
+constant: TOK_CSTINT
+     | TOK_CSTREAL
+     | ident
+     ;
+*/
+
+opt-label:
+     {strcpy($$,"");}
+     | label
+     ;
+
+/* R312 : label */
+label: TOK_LABEL
+     | TOK_CSTINT
+     ;
+
+opt-label-djview:
+     {strcpy($$,"");}
+     | label-djview
+     {strcpy($$,$1);}
+     ;
+     
+label-djview: TOK_LABEL_DJVIEW
+     ;
+
+/* R401 : type-param-value */
+type-param-value: scalar-int-expr
+     | '*'
+     | ':'
+     ;
+
+/* R402: type-spec */
+type-spec: intrinsic-type-spec
+     {strcpy($$,$1);}
+     | derived-type-spec
+     {strcpy($$,$1);}
+     ;
+
+/* R403 : declaration-type-spec */
+declaration-type-spec: {pos_cur_decl=my_position_before;} intrinsic-type-spec
+     {strcpy($$,$2);}
+     | TOK_TYPEPAR intrinsic-type-spec ')'
+     | TOK_TYPEPAR derived-type-spec ')'
+     {strcpy(DeclType,"type"); GlobalDeclarationType = 1;  }
+     ;
+
+/* R404 : intrinsic-type-spec */
+intrinsic-type-spec: TOK_INTEGER {in_kind_selector = 1;} opt-kind-selector
+     {sprintf($$,"%s%s",$1,$[opt-kind-selector]);strcpy(DeclType,$1); in_kind_selector =0;}
+     | TOK_REAL {in_kind_selector = 1;} opt-kind-selector
+     {sprintf($$,"%s%s",$1,$[opt-kind-selector]);strcpy(DeclType,$1);in_kind_selector =0;}
+     | TOK_DOUBLEPRECISION {in_kind_selector = 1;} opt-kind-selector
+     {sprintf($$,"%s%s",$1,$[opt-kind-selector]);strcpy(DeclType,"real"); strcpy(NamePrecision,"8");in_kind_selector =0;}
+     | TOK_COMPLEX {in_kind_selector = 1;} opt-kind-selector
+     {sprintf($$,"%s%s",$1,$[opt-kind-selector]);strcpy(DeclType,$1);in_kind_selector =0;}
+     | TOK_CHARACTER {in_char_selector = 1;} opt-char-selector
+     {sprintf($$,"%s%s",$1,$[opt-char-selector]);strcpy(DeclType,$1);in_char_selector = 0;}
+     | TOK_LOGICAL {in_kind_selector = 1;} opt-kind-selector
+     {sprintf($$,"%s%s",$1,$[opt-kind-selector]);strcpy(DeclType,$1);in_kind_selector =0;}
+     ;
+
+opt-kind-selector:
+     {strcpy($$,"");strcpy(NamePrecision,"");}
+     |kind-selector
+     {strcpy($$,$1);}
+     ;
+     
+/* R405 : kind-selector */
+/* Nonstandard extension : * INT */
+kind-selector: '(' scalar-int-constant-expr ')'
+     {sprintf($$,"(%s)",$2); strcpy(NamePrecision,$2);}
+     | '(' TOK_KIND '=' scalar-int-constant-expr ')'
+     {sprintf($$,"(KIND=%s)",$4); strcpy(NamePrecision,$4);}
+     | '*' TOK_CSTINT
+     {sprintf($$,"*%s",$2);strcpy(NamePrecision,$2);}
+     ;
+
+/* R406 : signed-int-literal-constant */
+/* sign replaced by add-op */
+
+signed-int-literal-constant:int-literal-constant
+     | add-op int-literal-constant
+     {sprintf($$,"%s%s",$1,$2);}
+     ;
+     
+/* R407 : int-literal-constant */
+int-literal-constant: TOK_CSTINT
+     | TOK_CSTINT '_' kind-param
+     {sprintf($$,"%s_%s",$1,$3);}
+     ;
+
+/*R408 : kind-param */
+kind-param: TOK_CSTINT
+     | TOK_NAME
+     ;
+
+opt-sign:
+     | sign
+     ;
+
+/* R411 : sign */
+sign:'+'
+     {strcpy($$,"+");}
+     | '-'
+     {strcpy($$,"-");}
+     ;
+
+/* R412 : signed-real-literal-constant */
+/* sign replaced by add-op */
+signed-real-literal-constant:real-literal-constant
+     | add-op real-literal-constant
+     {sprintf($$,"%s%s",$1,$2);}
+     ;
+
+/* R413 : real-literal-constant */
+real-literal-constant: TOK_CSTREAL
+     | TOK_CSTREAL '_' kind-param
+     {sprintf($$,"%s_%s",$1,$3);};
+     ;
+
+/* R417 : complex-literal-constant */
+/* in-complex-literal is just here to change default precedence rules ... */
+
+complex-literal-constant: '(' real-part TOK_COMMACOMPLEX imag-part ')'
+     {sprintf($$,"(%s,%s)",$2,$4);}
+     ;
+
+
+/* R418 : real-part */
+real-part: signed-int-literal-constant
+     | signed-real-literal-constant
+     | ident
+     ;
+
+/* R419 : imag-part */
+imag-part: signed-int-literal-constant
+     | signed-real-literal-constant
+     | named-constant
+     ;
+
+opt-char_length-star:
+     | '*' char-length
+     {char_length_toreset = 1;}
+     ;
+
+opt-char-selector:
+     {strcpy($$,"");}
+    | char-selector
+    {strcpy($$,"");}
+    ;
+
+/* R420 : char-selector */
+char-selector:length-selector
+    | '(' TOK_LEN '=' type-param-value ',' TOK_KIND '=' scalar-int-constant-expr ')'
+    | '(' type-param-value ',' scalar-int-constant-expr ')'
+    | '(' TOK_KIND '=' scalar-int-constant-expr ')'
+    | '(' TOK_KIND '=' scalar-int-constant-expr ',' TOK_LEN '=' type-param-value ')'
+    ;
+
+/* R421 : length-selector */
+length-selector: '(' type-param-value ')'
+     {strcpy(CharacterSize,$2);}
+     | '(' TOK_LEN '=' type-param-value ')'
+     {strcpy(CharacterSize,$4);}
+     | '*' char-length
+     | '*' char-length ','
+     ;
+
+/* R422 : char-length */
+char-length: '(' type-param-value ')'
+     {c_star=1; strcpy(CharacterSize,$2);}
+     | int-literal-constant
+     {c_selectorgiven = 1; strcpy(c_selectorname,$1);}
+     ;
+
+/* R423 : char-literal-constant */
+char-literal-constant: TOK_CHAR_CONSTANT
+     | TOK_CHAR_MESSAGE
+     | TOK_CHAR_CUT
+     ;
+
+/* R424 : logical-literal-constant */
+logical-literal-constant: TOK_TRUE
+     | TOK_FALSE
+     ;
+
+/* R425 : derived-type-def */
+derived-type-def: derived-type-stmt { inside_type_declare = 1;} opt-component-part end-type-stmt
+     { inside_type_declare = 0;}
+     ;
+     
+/* R426 : derived-type-stmt */
+derived-type-stmt: TOK_TYPE opt-type-attr-spec-list-comma-fourdots TOK_NAME line-break
+     | TOK_TYPE opt-type-attr-spec-list-comma TOK_NAME '(' type-param-name-list ')' line-break
+     ;
+
+opt-type-attr-spec-list-comma-fourdots:
+    | opt-type-attr-spec-list-comma TOK_FOURDOTS
+    ;
+ 
+ opt-type-attr-spec-list-comma:
+     | ',' type-attr-spec-list
+     ;
+
+type-attr-spec-list: type-attr-spec
+     | type-attr-spec-list ',' type-attr-spec
+     ;
+
+/* R427 : type-attr-spec */
+type-attr-spec: access-spec
+     ;
+
+type-param-name-list: type-param-name
+     | type-param-name-list ',' type-param-name
+     ;
+     
+type-param-name: TOK_NAME
+     ;
+
+/* R429 : end-type-stmt */
+end-type-stmt: TOK_ENDTYPE line-break
+     | TOK_ENDTYPE TOK_NAME line-break
+     ;
+
+opt-component-part:
+     | component-part
+     ;
+
+/* R434 : component-part */
+component-part: component-def-stmt
+    | component-part component-def-stmt
+    ;
+
+/* R435 : component-def-stmt */
+component-def-stmt: data-component-def-stmt
+    ;
+    
+/* R436 : data-component-def-stmt */
+data-component-def-stmt: declaration-type-spec opt-component-attr-spec-list-comma-2points component-decl-list line-break
+     ;
+
+opt-component-attr-spec-list-comma-2points:
+     | TOK_FOURDOTS
+     | ',' component-attr-spec-list TOK_FOURDOTS
+     ;
+
+component-attr-spec-list: component-attr-spec
+     | component-attr-spec-list ',' component-attr-spec
+     ;
+     
+/* R437 : component-attr-spec */
+component-attr-spec: access-spec
+     | TOK_ALLOCATABLE
+     | TOK_DIMENSION '(' {in_complex_literal=0;} component-array-spec ')'
+     | TOK_POINTER
+     ;
+
+component-decl-list: component-decl
+     | component-decl-list ',' component-decl
+     ;
+
+/* R438 : component-decl */
+component-decl : ident opt-component-array-spec opt-char_length-star opt-component-initialization
+       {
+            PublicDeclare = 0;
+            PrivateDeclare = 0;
+            ExternalDeclare = 0;
+            strcpy(NamePrecision,"");
+            c_star = 0;
+            InitialValueGiven = 0 ;
+            strcpy(IntentSpec,"");
+            VariableIsParameter =  0 ;
+            Allocatabledeclare = 0 ;
+            Targetdeclare = 0 ;
+            SaveDeclare = 0;
+            pointerdeclare = 0;
+            optionaldeclare = 0 ;
+            dimsgiven=0;
+            c_selectorgiven=0;
+            strcpy(nameinttypename,"");
+            strcpy(c_selectorname,"");
+            GlobalDeclarationType = 0;
+         }
+     ;
+
+opt-component-array-spec:
+     | '(' component-array-spec ')'
+     ;
+
+/* R439 : component-array-spec */
+component-array-spec: explicit-shape-spec-list
+     | deferred-shape-spec-list
+     ;
+
+opt-component-initialization:
+     | component-initialization
+     ;
+     
+/* R442 : component-initialization */
+component-initialization: '=' constant-expr
+      | TOK_POINT_TO null-init
+      | TOK_POINT_TO initial-data-target
+      ;
+
+/* R443 initial-data-target */
+initial-data-target: designator
+     {strcpy(my_dim.last,"");}
+     ;
+
+/* R453 : derived-type-spec */
+derived-type-spec: ident 
+     {strcpy(NamePrecision,$1);}
+     | ident '(' type-param-spec-list ')'
+     ;
+     
+type-param-spec-list: type-param-spec
+     | type-param-spec-list ',' type-param-spec
+     ;
+
+/* R454 : type-param-spec */
+type-param-spec: type-param-value
+    | keyword '=' type-param-value
+    ;
+
+/* R455 : structure-constructor */
+structure-constructor: derived-type-spec '(' ')'
+     | derived-type-spec '(' component-spec-list ')'
+     ;
+     
+component-spec-list: component-spec
+     | component-spec-list ',' component-spec
+     ;
+     
+/* R456 : component-spec */
+component-spec: component-data-source
+     | keyword '=' component-data-source
+     ;
+
+/* R457 : component-data-source */
+component-data-source: expr
+     | data-target
+     | proc-target
+     ;
+
+/* R468 : array-constructor */
+array-constructor: TOK_LEFTAB ac-spec TOK_RIGHTAB
+     { sprintf($$,"(/%s/)",$2);}
+     | lbracket ac-spec rbracket
+     { sprintf($$,"[%s]",$2); }
+     ;
+     
+/* R469 : ac-spec */
+/* type-spec TOK_FOURDOTS is removed due to conflicts with part-ref */
+
+/*ac-spec: type-spec TOK_FOURDOTS
+     {sprintf($$,"%s::",$1);}
+     | ac-value-list
+     | type-spec TOK_FOURDOTS ac-value-list
+     {sprintf($$,"%s::%s",$1,$3);}
+     ;
+*/
+
+ac-spec: ac-value-list
+     ;
+     
+/* R470 : lbracket */
+lbracket: '['
+     ;
+
+/* R471 : rbracket */
+rbracket: ']'
+     ;
+
+ac-value-list:
+        ac-value
+      | ac-value-list ',' ac-value
+      {sprintf($$,"%s,%s",$1,$3);}
+      ;
+
+/* R472 : ac-value */
+ac-value: expr
+      | ac-implied-do
+      ;
+
+/* R473 : ac-implied-do */
+ac-implied-do: '(' ac-value-list ',' ac-implied-do-control ')'
+     {sprintf($$,"(%s,%s)",$2,$4);}
+     ;
+
+/* R474 : ac-implied-do-control */
+ac-implied-do-control: ac-do-variable '=' scalar-int-expr ',' scalar-int-expr
+     {sprintf($$,"%s=%s,%s",$1,$3,$5);}
+     | ac-do-variable '=' scalar-int-expr ',' scalar-int-expr ',' scalar-int-expr
+     {sprintf($$,"%s=%s,%s,%s",$1,$3,$5,$7);}
+     ;
+
+/* R475 : ac-do-variable */
+ac-do-variable: do-variable
+     ;
+
+/* R501 : type-declaration-stmt */
+type-declaration-stmt: {indeclaration=1;} declaration-type-spec opt-attr-spec-construct entity-decl-list
+        {
+            /* if the variable is a parameter we can suppose that is*/
+            /*    value is the same on each grid. It is not useless */
+            /*    to create a copy of it on each grid               */
+            if ( ! inside_type_declare )
+            {
+                pos_end = setposcur();
+                //printf("POS = %d %d\n",pos_cur_decl,pos_end);
+                RemoveWordSET_0(fortran_out,pos_cur_decl,pos_end-pos_cur_decl);
+                ReWriteDeclarationAndAddTosubroutine_01($[entity-decl-list]);
+                pos_cur_decl = setposcur();
+                if ( firstpass == 0 && GlobalDeclaration == 0
+                                    && insubroutinedeclare == 0 )
+                {
+                    fprintf(fortran_out,"\n#include \"Module_Declar_%s.h\"\n", curmodulename);
+                    sprintf(ligne, "Module_Declar_%s.h", curmodulename);
+                    module_declar = open_for_write(ligne);
+                    GlobalDeclaration = 1 ;
+                    pos_cur_decl = setposcur();
+                }
+
+                if ( firstpass )
+                {
+                    Add_Globliste_1($[entity-decl-list]);
+                    if ( insubroutinedeclare )
+                    {
+                        if ( pointerdeclare ) Add_Pointer_Var_From_List_1($[entity-decl-list]);
+                        Add_Parameter_Var_1($[entity-decl-list]);
+                    }
+                    else
+                        Add_GlobalParameter_Var_1($[entity-decl-list]);
+
+                    /* If there's a SAVE declaration in module's subroutines we should    */
+                    /*    remove it from the subroutines declaration and add it in the    */
+                    /*    global declarations                                             */
+                                        
+                    if ( aftercontainsdeclare && SaveDeclare )
+                    {
+                        if ( inmodulemeet ) Add_SubroutineDeclarationSave_Var_1($[entity-decl-list]);
+                        else                Add_Save_Var_dcl_1($[entity-decl-list]);
+                    }
+                }
+            }
+            indeclaration = 0;
+            PublicDeclare = 0;
+            PrivateDeclare = 0;
+            ExternalDeclare = 0;
+            strcpy(NamePrecision,"");
+            c_star = 0;
+            InitialValueGiven = 0 ;
+            strcpy(IntentSpec,"");
+            VariableIsParameter =  0 ;
+            Allocatabledeclare = 0 ;
+            Targetdeclare = 0 ;
+            SaveDeclare = 0;
+            pointerdeclare = 0;
+            optionaldeclare = 0 ;
+            dimsgiven=0;
+            c_selectorgiven=0;
+            strcpy(nameinttypename,"");
+            strcpy(c_selectorname,"");
+            strcpy(DeclType,"");
+            GlobalDeclarationType = 0;
+        }
+     line-break
+     ;
+
+opt-attr-spec-construct:
+     | opt-attr-spec-comma-list TOK_FOURDOTS
+     ;
+
+opt-attr-spec-comma-list:
+     | attr-spec-comma-list
+     ;
+     
+attr-spec-comma-list:
+        ',' attr-spec
+      | attr-spec-comma-list ',' attr-spec
+      ;
+
+/* R502 : attr-spec */
+attr-spec:access-spec
+     | TOK_ALLOCATABLE
+     { Allocatabledeclare = 1; }
+     | TOK_DIMENSION '(' {in_complex_literal=0;} array-spec ')'
+     { dimsgiven = 1; curdim = $4; }
+     | TOK_EXTERNAL
+     { ExternalDeclare = 1; }
+     | TOK_INTENT '(' {in_complex_literal=0;} intent-spec ')'
+     { strcpy(IntentSpec,$4); }
+     | TOK_INTRINSIC
+     | TOK_OPTIONAL
+     { optionaldeclare = 1 ; }
+     | TOK_PARAMETER
+     {VariableIsParameter = 1; }
+     | TOK_POINTER
+     { pointerdeclare = 1 ; }
+     | TOK_SAVE
+     { SaveDeclare = 1 ; }
+     | TOK_TARGET
+     { Targetdeclare = 1; }
+     ;
+
+
+entity-decl-list: entity-decl
+     {$$=insertvar(NULL,$1);}
+     | entity-decl-list ',' entity-decl
+     {$$=insertvar($1,$3);}
+     ;
+
+/* R503 : entity-decl */
+entity-decl: object-name-noident opt-array-spec-par opt-char_length-star opt-initialization
+        {
+            if ( ! inside_type_declare )
+            {
+                if (dimsgiven == 1) curvar = createvar($1,curdim);
+                else                curvar = createvar($1,$2);
+                CreateAndFillin_Curvar(DeclType, curvar);
+                strcpy(curvar->v_typevar,DeclType);
+                curvar->v_catvar = get_cat_var(curvar);
+                
+                if (!strcasecmp(DeclType,"character"))
+                {
+                    if (c_selectorgiven == 1)
+                    {
+                        Save_Length(c_selectorname,1);
+                        strcpy(curvar->v_dimchar,c_selectorname);
+                    }
+                }
+            }
+            strcpy(vallengspec,"");
+            if (char_length_toreset == 1)
+            {
+            c_selectorgiven = 0;
+            c_star = 0;
+            strcpy(c_selectorname,"");
+            strcpy(CharacterSize,"");
+            char_length_toreset = 0;
+            }
+            $$=curvar;
+        }
+     ;
+
+
+/* R504 : object-name */
+object-name: ident
+     ;
+
+object-name-noident: TOK_NAME
+     ;
+
+opt-initialization: {InitialValueGiven = 0; }
+     | initialization
+     ;
+
+/* R505 : initialization */
+initialization: '=' constant-expr
+        {
+            if ( inside_type_declare ) break;
+            strcpy(InitValue,$2);
+            InitialValueGiven = 1;
+        }
+     | TOK_POINT_TO null-init
+        {
+            if ( inside_type_declare ) break;
+            strcpy(InitValue,$2);
+            InitialValueGiven = 2;
+        }
+     | TOK_POINT_TO initial-data-target
+        {
+            if ( inside_type_declare ) break;
+            strcpy(InitValue,$2);
+            InitialValueGiven = 2;
+        }
+     ;
+
+/* R506 : null-init */
+null-init: function-reference
+     ;
+
+/* R507 : access-spec */
+access-spec: TOK_PUBLIC
+     {PublicDeclare = 1;  }
+     | TOK_PRIVATE
+     {PrivateDeclare = 1;  }
+     ;
+
+opt-array-spec-par:
+     {$$=NULL;}
+     | '(' {in_complex_literal=0;} array-spec ')'
+     {$$=$3;}
+     ;
+
+/* R514 : array-spec */
+array-spec: explicit-shape-spec-list
+     {$$=$1;}
+     | assumed-shape-spec-list
+     {$$=$1;}
+     | deferred-shape-spec-list
+     {$$=$1;}
+     | assumed-size-spec
+     {$$=$1;}
+     | implied-shape-spec-list
+     {$$=$1;}
+     ;
+
+explicit-shape-spec-list: explicit-shape-spec
+        {
+            $$ = (listdim*) NULL;
+            if ( inside_type_declare ) break;
+            if ( created_dimensionlist == 1 || agrif_parentcall == 1 )  $$=insertdim(NULL,$1);
+        }
+      | explicit-shape-spec-list ',' explicit-shape-spec
+        {
+            $$ = (listdim*) NULL;
+            if ( inside_type_declare ) break;
+            if ( (!inside_type_declare) && created_dimensionlist == 1 ) $$=insertdim($1,$3);
+        }
+      ;
+      
+/* R516 : explicit-shape-spec */
+explicit-shape-spec: lower-bound ':' upper-bound
+     {strcpy($$.first,$1);  Save_Length($1,2); strcpy($$.last,$3); Save_Length($3,1); }
+     |upper-bound 
+     {strcpy($$.first,"1"); strcpy($$.last,$1); Save_Length($1,1);}
+     ;
+     
+/* R517 : lower-bound */
+lower-bound: specification-expr
+     {strcpy($$,$1);}
+     ;
+     
+/* R518 : upper-bound */
+upper-bound: specification-expr
+     ;
+
+assumed-shape-spec-list:
+        assumed-shape-spec
+        {
+            $$ = (listdim*) NULL;
+            if ( inside_type_declare ) break;
+            if ( created_dimensionlist == 1 || agrif_parentcall == 1 )  $$=insertdim(NULL,$1);
+        }
+      | assumed-shape-spec-list ',' assumed-shape-spec
+        {
+            $$ = (listdim*) NULL;
+            if ( inside_type_declare ) break;
+            if ( (!inside_type_declare) && created_dimensionlist == 1 ) $$=insertdim($1,$3);
+        }
+      ;
+
+/* R519 : assumed-shape-spec */
+assumed-shape-spec : ':'
+      { strcpy($$.first,"");  strcpy($$.last,"");  }
+      | lower-bound ':'
+      { strcpy($$.first,$1);  Save_Length($1,2); strcpy($$.last,""); }
+      ;
+
+deferred-shape-spec-list:
+        deferred-shape-spec
+        {
+            $$ = (listdim*) NULL;
+            if ( inside_type_declare ) break;
+            if ( created_dimensionlist == 1 || agrif_parentcall == 1 )  $$=insertdim(NULL,$1);
+        }
+      | deferred-shape-spec-list ',' deferred-shape-spec
+        {
+            $$ = (listdim*) NULL;
+            if ( inside_type_declare ) break;
+            if ( (!inside_type_declare) && created_dimensionlist == 1 ) $$=insertdim($1,$3);
+        }
+      ;
+
+/* R520 : deferred-shape-spec */
+deferred-shape-spec: ':'
+     { strcpy($$.first,"");  strcpy($$.last,"");  }
+     ;
+
+/* R521 : assume-size-spec */
+assumed-size-spec:opt-explicit-shape-spec-list-comma opt-lower-bound-2points '*'
+        {
+            $$ = (listdim*) NULL;
+            if ( inside_type_declare ) break;
+            if ( created_dimensionlist == 1 || agrif_parentcall == 1 ) 
+            {
+            if (!strcasecmp($2,""))
+            {
+            strcpy(my_dim.first,"1");
             }
             else
             {
-                if ( insubroutinedeclare )
-                    copyuse_0($2);
-
-                if ( inmoduledeclare == 0 )
+            strcpy(my_dim.first,$2);
+            }
+            strcpy(my_dim.last,"*");
+            $$=insertdim($1,my_dim);
+            strcpy(my_dim.first,"");
+            strcpy(my_dim.last,"");
+            }
+        }
+     ;
+     
+opt-explicit-shape-spec-list-comma:
+     {$$ = (listdim *) NULL;}
+     | explicit-shape-spec-list ','
+     {$$ = $1;}
+     ;
+
+explicit-shape-spec-list-comma: explicit-shape-spec ','
+        {
+            $$ = (listdim*) NULL;
+            if ( inside_type_declare ) break;
+            if ( created_dimensionlist == 1 || agrif_parentcall == 1 )  $$=insertdim(NULL,$1);
+        }
+     | explicit-shape-spec-list-comma explicit-shape-spec ','
+        {
+            $$ = (listdim*) NULL;
+            if ( inside_type_declare ) break;
+            if ( (!inside_type_declare) && created_dimensionlist == 1 ) $$=insertdim($1,$2);
+        }
+     ;
+
+opt-lower-bound-2points:
+     {strcpy($$,"");}
+     | lower-bound ':'
+     {strcpy($$,$1);}
+     ;
+
+implied-shape-spec-list: implied-shape-spec
+     | implied-shape-spec-list ',' implied-shape-spec
+     ;
+
+/* R522 : implied-shape-spec */
+implied-shape-spec: opt-lower-bound-2points '*'
+     ;
+
+/* R523 : intent-spec */
+intent-spec: TOK_IN
+     { strcpy($$,$1); }
+     | TOK_OUT
+     { strcpy($$,$1); }
+     | TOK_INOUT
+     { strcpy($$,$1); }
+     ;
+
+/* R524 : access-stmt */
+access-stmt: access-spec opt-access-id-list
+     {
+            if ((firstpass == 0) && (PublicDeclare == 1))
+            {
+                if ($2)
+                {
+                    removeglobfromlist(&($2));
+                    pos_end = setposcur();
+                    RemoveWordSET_0(fortran_out,pos_cur,pos_end-pos_cur);
+                    writelistpublic($2);
+                }
+            }
+     PublicDeclare = 0;
+     PrivateDeclare = 0;
+     }
+     line-break
+     ;
+
+opt-access-id-list:
+     {$$=(listname *)NULL;}
+     | opt-TOK_FOURDOTS access-id-list
+     {$$=$2;}
+     ;
+
+access-id-list: access-id
+     {$$=Insertname(NULL,$1,0);}
+     | access-id-list ',' access-id
+     {$$=Insertname($1,$3,0);}
+     ;
+     
+/* R525 : access-id */
+access-id: TOK_NAME
+     | generic-spec
+     ;
+     
+/* R534 : data-stmt */
+data-stmt: TOK_DATA data-stmt-set opt-data-stmt-set-nlist
+        {
+            /* we should remove the data declaration                */
+            pos_end = setposcur();
+            RemoveWordSET_0(fortran_out,pos_curdata,pos_end-pos_curdata);
+            if ( aftercontainsdeclare == 1  && firstpass == 0 )
+            {
+                ReWriteDataStatement_0(fortran_out);
+                pos_end = setposcur();
+            }
+            Init_List_Data_Var();
+        }
+        line-break
+     ;
+
+opt-data-stmt-set-nlist:
+     | data-stmt-set-nlist
+     ;
+
+data-stmt-set-nlist: opt-comma data-stmt-set
+     | data-stmt-set-nlist opt-comma data-stmt-set
+     ;
+
+/* R535 : data-stmt-set */
+data-stmt-set: data-stmt-object-list TOK_SLASH data-stmt-value-list TOK_SLASH
+        {
+            if (firstpass == 1)  
+            {
+            Add_Data_Var_Names_01(&List_Data_Var,$1,$3);
+            }
+            else                 Add_Data_Var_Names_01(&List_Data_Var_Cur,$1,$3);
+        }
+     ;
+
+data-stmt-object-list: data-stmt-object
+     { $$=insertvar(NULL,$1); }
+     | data-stmt-object-list ',' data-stmt-object
+     {
+     $$ = insertvar($1,$3);
+     }
+     ;
+
+data-stmt-value-list: data-stmt-value
+     {$$=Insertname(NULL,$1,0);}
+     | data-stmt-value-list ',' data-stmt-value
+     {$$ = Insertname($1,$3,1);   }
+     ;
+     
+/* R536 : data-stmt-object */
+data-stmt-object: variable
+     | data-implied-do
+     ;
+ 
+/* R537 : data-implied-do */            
+data-implied-do: '(' data-i-do-object-list ',' data-i-do-variable '=' scalar-int-constant-expr ',' scalar-int-constant-expr ')'
+     {printf("DOVARIABLE = %s %s %s\n",$4,$6,$8);
+     printf("AUTRE = %s %s\n",$2->var->v_nomvar,$2->var->v_initialvalue_array);
+     Insertdoloop($2->var,$4,$6,$8,"");
+     $$=$2->var;
+     }
+     | '(' data-i-do-object-list ',' data-i-do-variable '=' scalar-int-constant-expr ',' scalar-int-constant-expr ',' scalar-int-constant-expr ')'
+     {
+     Insertdoloop($2->var,$4,$6,$8,$10);
+     $$=$2->var;
+     }
+     ;
+
+data-i-do-object-list: data-i-do-object
+     {$$=insertvar(NULL,$1);}
+     | data-i-do-object-list ',' data-i-do-object
+     {$$ = insertvar($1,$3);}
+     ;
+
+/* R538 : data-i-do-object */
+data-i-do-object: array-element
+     | scalar-structure-component
+     {$$->v_initialvalue_array=Insertname($$->v_initialvalue_array,my_dim.last,0);
+     strcpy(my_dim.last,"");
+     }
+     | data-implied-do
+     ;
+
+/* R539 : data-i-do-variable */
+data-i-do-variable: do-variable
+     ;
+
+/* R540 : data-stmt-value */
+/* data-stmt-repeat and first data-stmt-constant inlined */
+data-stmt-value: scalar-constant-subobject opt-data-stmt-star
+     {sprintf($$,"%s%s",$1,$2);}
+     | int-literal-constant opt-data-stmt-star
+     {sprintf($$,"%s%s",$1,$2);}
+     | char-literal-constant opt-data-stmt-star
+     {sprintf($$,"%s%s",$1,$2);}
+     | signed-int-literal-constant
+     | signed-real-literal-constant
+     | null-init
+     | initial-data-target
+     | structure-constructor
+     ;
+
+opt-data-stmt-star:
+     {strcpy($$,"");}
+     | '*' data-stmt-constant
+     {sprintf($$,"*%s",$2);}
+     ;
+
+opt-data-stmt-repeat-star:
+     | data-stmt-repeat '*'
+     ;
+
+/* R541 : data-stmt-repeat */
+/* scalar-int-constant inlined */
+
+data-stmt-repeat: scalar-int-constant
+     | scalar-int-constant-subobject
+     ;
+
+/* R542 : data-stmt-constant */
+data-stmt-constant: scalar-constant
+     | scalar-constant-subobject
+     | signed-int-literal-constant
+     | signed-real-literal-constant
+     | null-init
+     | initial-data-target
+     | structure-constructor
+     ;
+
+scalar-int-constant-subobject: int-constant-subobject
+     ;
+
+scalar-constant-subobject: constant-subobject
+     ;
+
+/* R543 : int-constant-subobject */
+int-constant-subobject: constant-subobject
+     ;
+     
+/* R544 : constant-subobject */
+constant-subobject: designator
+     {strcpy(my_dim.last,"");}
+     ;
+     
+/* R545 : dimension-stmt */
+dimension-stmt: {positioninblock = 0; pos_curdimension = my_position_before;}
+     TOK_DIMENSION opt-TOK_FOURDOTS array-name-spec-list
+        {
+            /* if the variable is a parameter we can suppose that is   */
+            /*    value is the same on each grid. It is not useless to */
+            /*    create a copy of it on each grid                     */
+            if ( ! inside_type_declare )
+            {
+                if ( firstpass )
+                {
+                    Add_Globliste_1($4);
+                    /* if variableparamlists has been declared in a subroutine   */
+                    if ( insubroutinedeclare )     Add_Dimension_Var_1($4);
+                    
+                    /* Add it to the List_SubroutineDeclaration_Var list if not present */
+                    /* NB: if not done, a variable declared with DIMENSION but with no type given */
+                    /* will not be declared by the conv */
+                    ReWriteDeclarationAndAddTosubroutine_01($4);
+                }
+                else
                 {
                     pos_end = setposcur();
-                    RemoveWordSET_0(fortran_out,pos_curuse,pos_end-pos_curuse);
+                    RemoveWordSET_0(fortran_out,pos_curdimension,pos_end-pos_curdimension);
+                    ReWriteDeclarationAndAddTosubroutine_01($4);
                 }
             }
-        }
-      | word_use TOK_NAME ',' rename_list
-        {
+            PublicDeclare = 0;
+            PrivateDeclare = 0;
+            ExternalDeclare = 0;
+            strcpy(NamePrecision,"");
+            c_star = 0;
+            InitialValueGiven = 0 ;
+            strcpy(IntentSpec,"");
+            VariableIsParameter =  0 ;
+            Allocatabledeclare = 0 ;
+            Targetdeclare = 0 ;
+            SaveDeclare = 0;
+            pointerdeclare = 0;
+            optionaldeclare = 0 ;
+            dimsgiven=0;
+            c_selectorgiven=0;
+            strcpy(nameinttypename,"");
+            strcpy(c_selectorname,"");
+        }
+     line-break
+     ;
+     
+array-name-spec-list: TOK_NAME '(' {in_complex_literal = 0;} array-spec ')'
+     {
+        if ( inside_type_declare ) break;
+        curvar = createvar($1,$4);
+        CreateAndFillin_Curvar("", curvar);
+        curlistvar=insertvar(NULL, curvar);
+        $$ = settype("",curlistvar);
+        strcpy(vallengspec,"");
+     }
+     | array-name-spec-list ',' TOK_NAME '(' {in_complex_literal = 0;} array-spec ')'
+        {
+        if ( inside_type_declare ) break;
+        curvar = createvar($3,$6);
+        CreateAndFillin_Curvar("", curvar);
+        curlistvar = insertvar($1, curvar);
+        $$ = curlistvar;
+        strcpy(vallengspec,"");
+        }
+     ;
+
+
+/* R548 : parameter-stmt */
+parameter-stmt: TOK_PARAMETER { VariableIsParameter = 1; pos_curparameter = setposcur()-9; } '(' named-constant-def-list ')'
+        {
+            if ( ! inside_type_declare )
+            {
+                if ( firstpass )
+                {
+                    if ( insubroutinedeclare )  Add_Parameter_Var_1($4);
+                    else                        Add_GlobalParameter_Var_1($4);
+                }
+                else
+                {
+                    pos_end = setposcur();
+                    RemoveWordSET_0(fortran_out, pos_curparameter, pos_end-pos_curparameter);
+                }
+            }
+            VariableIsParameter =  0 ;
+        }
+        line-break
+     ;
+
+named-constant-def-list: named-constant-def
+     {$$=insertvar(NULL,$1);}
+     | named-constant-def-list ',' named-constant-def
+     {$$=insertvar($1,$3);}
+     ;
+
+/* R549 : named-constant-def */
+named-constant-def: TOK_NAME '=' constant-expr
+        {
+            if ( inside_type_declare ) break;
+            curvar=(variable *) calloc(1,sizeof(variable));
+            Init_Variable(curvar);
+            curvar->v_VariableIsParameter = 1;
+            strcpy(curvar->v_nomvar,$1);
+            strcpy(curvar->v_subroutinename,subroutinename);
+            strcpy(curvar->v_modulename,curmodulename);
+            curvar->v_initialvalue=Insertname(curvar->v_initialvalue,$3,0);
+            strcpy(curvar->v_commoninfile,cur_filename);
+            Save_Length($3,14);
+            $$ = curvar;
+        }
+     ;
+
+/* R553 : save-stmt */
+save-stmt: {pos_cursave = my_position_before;} TOK_SAVE opt-TOK_FOURDOTS opt-saved-entity-list
+     {
+     pos_end = setposcur();
+     RemoveWordSET_0(fortran_out,pos_cursave,pos_end-pos_cursave);
+     }
+     line-break
+     ;
+
+opt-TOK_FOURDOTS:
+     | TOK_FOURDOTS
+     ;
+
+opt-saved-entity-list:
+     | saved-entity-list
+     ;
+
+saved-entity-list: saved-entity
+     | saved-entity-list ',' saved-entity
+     ;
+
+/* R554 : saved-entity */
+saved-entity: object-name
+     {if ( ! inside_type_declare ) Add_Save_Var_1($1,(listdim*) NULL); }
+     | proc-pointer-name
+     | common-block-name
+     ;
+
+/* R555 : proc-pointer-name */
+proc-pointer-name: ident
+     ;
+
+get_my_position:
+     {my_position = my_position_before;}
+     ;
+
+/* R560 : implicit-stmt */
+implicit-stmt: get_my_position TOK_IMPLICIT implicit-spec-list line-break
+    | get_my_position TOK_IMPLICIT TOK_NONE
+        {
+            if ( insubroutinedeclare == 1 )
+            {
+                Add_ImplicitNoneSubroutine_1();
+                pos_end = setposcur();
+                RemoveWordSET_0(fortran_out,my_position,pos_end-my_position);
+            }
+        }
+    line-break
+    ;
+
+implicit-spec-list: implicit-spec
+     | implicit-spec-list ',' implicit-spec
+     ;
+
+/*R561 implicit-spec */
+implicit-spec: declaration-type-spec '(' letter-spec-list ')'
+    ;
+
+letter-spec-list:letter-spec
+     | letter-spec-list ',' letter-spec
+     ;
+     
+/* R562 : letter-spec */
+letter-spec: TOK_NAME
+     | TOK_NAME '-' TOK_NAME
+     ;
+
+/* R563 : namelist-stmt */
+namelist-stmt: TOK_NAMELIST TOK_SLASH TOK_NAME TOK_SLASH namelist-group-object-list opt-namelist-other line-break
+     ;
+
+opt-namelist-other:
+     | opt-namelist-other opt-comma TOK_SLASH TOK_NAME TOK_SLASH namelist-group-object-list
+
+namelist-group-object-list:namelist-group-object
+     | namelist-group-object-list ',' namelist-group-object
+     ;
+
+/* R564 : namelist-group-object */
+namelist-group-object: variable-name
+    ;
+
+/* R565 : equivalence-stmt */
+equivalence-stmt:  TOK_EQUIVALENCE equivalence-set-list line-break
+     ;
+
+equivalence-set-list:equivalence-set
+     | equivalence-set-list ',' equivalence-set
+     ;
+
+/* R566 : equivalence-set */
+equivalence-set: '(' {in_complex_literal=0;} equivalence-object ',' equivalence-object-list ')'
+     ;
+
+equivalence-object-list:equivalence-object
+     | equivalence-object-list ',' equivalence-object
+     ;
+
+/* R567 : equivalence-object */     
+equivalence-object: variable-name
+     | array-element
+     | substring
+     ;
+
+
+/* R568 : common-stmt */
+common-stmt: TOK_COMMON { positioninblock = 0; pos_curcommon = my_position_before; indeclaration=1;} opt-common-block-name common-block-object-list opt-common-block-list
+     {
+            indeclaration = 0;
+            if ( inside_type_declare ) break;
+            pos_end = setposcur();
+            RemoveWordSET_0(fortran_out,pos_curcommon,pos_end-pos_curcommon);
+     }
+     line-break
+     ;
+
+opt-common-block-name:
+     | common-block-name
+     {
+     if ( inside_type_declare ) break;
+     sprintf(charusemodule,"%s",$1);
+     Add_NameOfCommon_1($1,subroutinename);
+     }
+     ;
+     
+common-block-name:TOK_DSLASH
+        {
+            strcpy($$,"");
+            positioninblock=0;
+            strcpy(commonblockname,"");
+        }
+     | TOK_SLASH TOK_NAME TOK_SLASH
+        {
+            strcpy($$,$2);
+            positioninblock=0;
+            strcpy(commonblockname,$2);
+        }
+      ;
+
+opt-comma:
+     | ','
+     ;
+
+opt-common-block-list:
+     | opt-common-block-list opt-comma common-block-name
+     {
+     if ( inside_type_declare ) break;
+     sprintf(charusemodule,"%s",$3);
+     Add_NameOfCommon_1($3,subroutinename);
+     }
+     common-block-object-list
+     ;
+
+
+common-block-object-list: common-block-object
+     {if ( ! inside_type_declare ) Add_Common_var_1(); }
+     | common-block-object-list ',' common-block-object
+     {if ( ! inside_type_declare ) Add_Common_var_1(); }
+     ;
+  
+/* R569 : common-block-object */
+/* variable-name replaced by TOK_NAME */
+/* because the corresponding variable do not have to be added to the listofsubroutine_used */
+
+common-block-object: TOK_NAME
+        {
+            positioninblock = positioninblock + 1 ;
+            strcpy(commonvar,$1);
+            commondim = (listdim*) NULL;
+        }
+     | TOK_NAME '(' {in_complex_literal=0;} array-spec ')'
+        {
+            positioninblock = positioninblock + 1 ;
+            strcpy(commonvar,$1);
+            commondim = $4;
+        }
+     ;
+
+/* R601 : designator */
+designator: array-element
+     | array-section
+     | structure-component
+     | substring
+     {$$=createvar($1,NULL);}
+     ;
+/* R602 : variable */
+/*variable: designator
+       | expr
+       ;
+*/
+
+scalar-variable: variable
+     ;
+     
+variable: designator
+       {if (strcmp(my_dim.last,""))
+       {
+       $$->v_initialvalue_array=Insertname(NULL,my_dim.last,0);
+       }
+       strcpy(my_dim.last,"");
+       }
+       ;
+       
+scalar-variable-name: variable-name
+     ;
+
+/* R603 : variable-name */
+variable-name: ident
+      ;
+
+scalar-logical-variable: logical-variable
+      ;
+
+/* R604 : logical-variable */
+logical-variable: variable
+      ;
+
+/* R605 : char-variable */
+char-variable: variable
+       ;
+
+scalar-default-char-variable: default-char-variable
+     ;
+     
+/* R606 : default-char-variable */
+default-char-variable: variable
+     ;
+
+scalar-int-variable: int-variable
+      ;
+      
+int-variable: variable
+     ;
+
+/* R608 : substring */
+substring: data-ref
+     | data-ref '(' substring-range ')'
+     {sprintf($$,"%s(%s)",$1,$3);}
+     | char-literal-constant '(' substring-range ')'
+     {sprintf($$,"%s(%s)",$1,$3);}
+     ;
+
+/* R609 : parent-string */
+/* IS INLINED IN SUBSTRING (R608) */
+/*
+parent-string: scalar-variable-name
+     | array-element
+     | scalar-structure-component
+     | scalar-constant
+     ;
+*/
+
+/* R610 : substring-range */
+substring-range: opt-scalar-int-expr ':' opt-scalar-int-expr
+     {sprintf($$,"%s:%s",$1,$3);}
+     ;
+
+/* R611: data-ref */
+data-ref: part-ref opt-part-ref
+     {sprintf($$,"%s%s",$1->v_nomvar,$2);}
+     ;
+     
+opt-part-ref:
+     {strcpy($$,"");}
+     | opt-part-ref '%' part-ref
+     {sprintf($$,"%s%%%s",$1,$3->v_nomvar);}
+     ;
+
+/* R612 : part-ref */
+part-ref:ident
+     {$$=createvar($1,NULL);}
+     | ident '(' {in_complex_literal=0;} section-subscript-list ')'
+     {sprintf(ligne,"%s(%s)",$1,$4);$$=createvar($1,NULL);strcpy(my_dim.last,$4);}
+     ;
+     
+/* $$=createvar($1,insertdim(NULL,my_dim));
+{strcpy(my_dim.first,"1");strcpy(my_dim.last,$4);$$=createvar($1,insertdim(NULL,my_dim));}
+} */
+
+/*part-name: ident
+     ;
+*/
+
+scalar-structure-component: structure-component
+     ;
+
+/* R613 : structure-component */
+structure-component: data-ref
+     {strcpy(my_dim.last,"");}
+     ;
+
+/* R617 : array-element */
+array-element: data-ref
+      {strcpy(my_dim.last,"");}
+      ;
+
+/* R618 : array-section */
+array-section: data-ref
+     {strcpy(my_dim.last,"");}
+     | data-ref '(' substring-range ')'
+     {strcpy(my_dim.last,"");}
+      ;
+
+/* section-subscript-list can be empty ... */
+/* in contradiction with the grammar ... */
+section-subscript-list:
+      {strcpy($$,"");}
+      |  section-subscript
+      {strcpy($$,$1);}
+      | section-subscript-list ',' section-subscript
+      {sprintf($$,"%s,%s",$1,$3);}
+      ;
+
+opt-subscript:
+     {strcpy($$,"");}
+     | subscript
+     ;
+
+/* R619 : subscript */
+subscript: scalar-int-expr
+     ;
+
+/* R620 : section-subscript */
+/*section-subscript: subscript
+     | subscript-triplet
+     | vector-subscript
+     ;
+*/
+
+/* USE OpenFortranParser rules */
+
+section-subscript: expr section_subscript_ambiguous
+     {sprintf($$,"%s%s",$1,$2);}
+     | ':'
+     {strcpy($$,":");}
+     | ':' expr 
+     {sprintf($$,":%s",$2);}
+     | ':' ':' expr
+     {sprintf($$,": :%s",$3);}
+     | ':' expr ':' expr
+     {sprintf($$,":%s :%s",$2,$4);}
+     | TOK_FOURDOTS expr
+     {sprintf($$,"::%s",$2);}
+     | vector-subscript
+     | ident '=' expr
+     {sprintf($$,"%s=%s",$1,$3);}
+     | ident '=' '*' label
+     {sprintf($$,"%s=*%s",$1,$4);}
+     | '*' label
+     {sprintf($$,"*%s",$2);}
+     ;
+
+section_subscript_ambiguous: ':'
+     {strcpy($$,":");}
+     | ':' expr
+     {sprintf($$,":%s",$2);}
+     | ':' ':' expr
+     {sprintf($$,": :%s",$3);}
+     | ':' expr ':' expr
+     {sprintf($$,":%s :%s",$2,$4);}
+     | TOK_FOURDOTS expr
+     {sprintf($$,"::%s",$2);}
+     |
+     {strcpy($$,"");}
+     ;
+/* R621 : subscript-triplet */
+subscript-triplet: opt-subscript ':' opt-subscript 
+     {sprintf($$,"%s:%s",$1,$3);}
+     | opt-subscript ':' opt-subscript ':' stride
+     {sprintf($$,"%s:%s:%s",$1,$3,$5);}
+     ;
+
+/* R622 : stride */
+stride: scalar-int-expr
+     ;
+     
+/* R623 : vector-subscript */
+vector-subscript: int-expr
+     ;
+
+/* R626 : allocate-stmt */
+allocate-stmt: TOK_ALLOCATE '(' {in_complex_literal=0;} allocation-list opt-alloc-opt-list-comma ')'
+     {inallocate = 0;}
+     line-break
+     ;
+
+opt-type-spec-fourdots:
+     | type-spec TOK_FOURDOTS
+     ;
+
+opt-alloc-opt-list-comma:
+     | ',' alloc-opt-list
+     ;
+
+alloc-opt-list:
+        alloc-opt
+      | alloc-opt-list ',' alloc-opt
+      ;
+      
+/* R627 : alloc-opt */
+alloc-opt: TOK_ERRMSG errmsg-variable
+     | TOK_STAT '=' stat-variable
+     ;
+     
+/* R628 : stat-variable */
+stat-variable: scalar-int-variable
+     ;
+     
+/* R629 : errmsg-variable */
+errmsg-variable: scalar-default-char-variable
+    ;
+
+allocation-list:
+        allocation
+      | allocation-list ',' allocation
+      ;
+ 
+/* R631 allocation */
+allocation: allocate-object opt-allocate-shape-spec-list-par
+     ;
+
+/* R632 allocate-object */     
+allocate-object: variable-name
+     | structure-component
+     ;
+
+opt-allocate-shape-spec-list-par:
+     | '(' allocate-shape-spec-list ')'
+     ;
+
+allocate-shape-spec-list:
+        allocate-shape-spec
+      | allocate-shape-spec-list ',' allocate-shape-spec
+      ;
+
+/* R633 : allocate-shape-spec */
+allocate-shape-spec: opt-lower-bound-expr upper-bound-expr
+     ;
+
+opt-lower-bound-expr:
+     | lower-bound-expr ':'
+     ;
+
+/* R634 : lower-bound-expr */
+lower-bound-expr: scalar-int-expr
+     ;
+
+/* R634 : upper-bound-expr */
+upper-bound-expr: scalar-int-expr
+     ;
+     
+/* R640 : deallocate-stmt */
+deallocate-stmt: TOK_DEALLOCATE '(' {in_complex_literal=0;} allocate-object-list opt-dealloc-opt-list-comma ')'
+     {inallocate = 0;}
+     line-break
+     ;
+
+allocate-object-list:
+        allocate-object
+      | allocate-object-list ',' allocate-object
+      ;
+      
+opt-dealloc-opt-list-comma:
+     | ',' dealloc-opt-list
+     ;
+
+dealloc-opt-list:
+        dealloc-opt
+      | dealloc-opt-list ',' dealloc-opt
+      ;
+      
+/* R641 : dealloc-opt */
+dealloc-opt: TOK_ERRMSG errmsg-variable
+     | TOK_STAT '=' stat-variable
+     ;
+
+/* R701 : primary */
+/* remove type-param-name */
+/* constant replaced by literal-constant to avoid conflict with designato */
+/* real-part is added because potential conflicts with complex-literal-constant */
+
+primary: 
+      designator
+      {
+      strcpy($$,$1->v_nomvar);
+      if (strcasecmp(my_dim.last,""))
+      {
+      strcat($$,"(");
+      strcat($$,my_dim.last);
+      strcat($$,")");
+      }
+      }
+      | literal-constant
+      | array-constructor
+      | function-reference
+      | '(' expr ')'
+     { sprintf($$,"(%s)",$2);}
+     ;
+
+/* R702 : level-1-expr */
+level-1-expr: primary
+      {strcpy(my_dim.last,"");}
+     ;
+
+/* R704 : mult-operand */
+mult-operand: level-1-expr
+     | level-1-expr power-op mult-operand
+     {sprintf($$,"%s**%s",$1,$3);}
+     ;
+/* R705 : add-operand */
+add-operand: mult-operand
+     | add-operand mult-op mult-operand
+     { sprintf($$,"%s%s%s",$1,$2,$3); }
+     ;
+     
+/* R706 : level-2-expr */
+/* add signed-int-literal-constant because potential reduce conflict with add-op add-operand */
+
+level-2-expr: add-operand
+     | add-op add-operand
+     { sprintf($$,"%s%s",$1,$2); }
+     | level-2-expr add-op add-operand
+     { sprintf($$,"%s%s%s",$1,$2,$3); }
+     | signed-int-literal-constant
+     | level-2-expr signed-int-literal-constant
+     { sprintf($$,"%s%s",$1,$2); }
+     ;
+     
+/* R707 : power-op */
+power-op : TOK_DASTER
+     ;
+     
+/* R708 : mult-op */
+mult-op : '*'
+     {strcpy($$,"*");}
+     | TOK_SLASH
+     ;
+     
+/* R709 : add-op */
+add-op : '+'
+     {strcpy($$,"+");}
+     | '-'
+     {strcpy($$,"-");}     
+     ;     
+
+/* R710 : level-3-expr */
+level-3-expr: level-2-expr
+     | level-3-expr concat-op level-2-expr
+     { sprintf($$,"%s%s%s",$1,$2,$3); }
+     ;
+
+/* R711 : concat-op */
+concat-op : TOK_DSLASH
+     ;
+/* R712 : level-4-expr */
+level-4-expr: level-3-expr
+     | level-3-expr rel-op level-3-expr
+     { sprintf($$,"%s%s%s",$1,$2,$3); }
+     ;
+
+/* R713 : rel-op */
+rel-op : TOK_EQ
+     | TOK_NE
+     | TOK_LT
+     | TOK_LE
+     | TOK_GT
+     | TOK_GE
+     | TOK_EQUALEQUAL
+     | TOK_SLASHEQUAL
+     | '<'
+     {strcpy($$,"<");}
+     | TOK_INFEQUAL
+     | '>'
+     {strcpy($$,">");}
+     | TOK_SUPEQUAL
+     ;
+
+/* R714 : and-operand */
+/* level-4-expr inlined as level-3-expr */
+and-operand: level-4-expr
+     | not-op level-4-expr
+     { sprintf($$,"%s%s",$1,$2); }
+     ;
+
+
+/* R715 : or-operand */
+or-operand: and-operand
+     | or-operand and-op and-operand
+     { sprintf($$,"%s%s%s",$1,$2,$3); }
+     ;
+
+
+/* R716 : equiv-operand */
+equiv-operand : or-operand
+     | equiv-operand or-op or-operand
+     { sprintf($$,"%s%s%s",$1,$2,$3); }
+     ;
+
+/* R717 : level-5-expr */
+level-5-expr: equiv-operand
+     | level-5-expr equiv-op equiv-operand
+     { sprintf($$,"%s%s%s",$1,$2,$3); }
+     ;
+
+/* R718 : not-op */
+not-op: TOK_NOT
+     ;
+     
+/* R719 : and-op */
+and-op: TOK_AND
+     ;
+     
+/* R720 : or-op */
+or-op: TOK_OR
+     ;
+
+/* R721 : equiv-op */
+equiv-op: TOK_EQV
+     | TOK_NEQV
+     ;
+     
+/* R722 : expr */
+expr: level-5-expr
+     ;
+
+scalar-default-char-expr: default-char-expr
+     ;
+
+/* R725 : default-char-expr */
+default-char-expr : expr
+       ;
+
+/* R726 : int-expr */
+int-expr: expr
+       ;
+
+opt-scalar-int-expr:
+     {strcpy($$,"");}
+     | scalar-int-expr
+     ;
+
+scalar-int-expr: int-expr
+       ;
+
+/* R728 : specification-expr */
+specification-expr: scalar-int-expr
+     {
+     strcpy($$,$1);
+     }
+     ;
+
+/* R729 : constant-expr */
+constant-expr: expr
+     {strcpy($$,$1);}
+     ;
+
+scalar-default-char-constant-expr: default-char-constant-expr
+     ;
+     
+/* R730: default-char-constant-expr */
+default-char-constant-expr: default-char-expr
+     ;
+
+scalar-int-constant-expr: int-constant-expr
+     ;
+
+/* R731 : int-constant-expr */
+int-constant-expr: int-expr
+     ;
+
+/* R732 : assignment-stmt */
+/* cannot use opt-label due to conflicts ... */
+
+assignment-stmt: variable '=' expr line-break
+      | label variable '=' expr line-break
+      ;
+
+/* R733 : pointer-assignment-stmt */
+
+/* data-pointer-object and proc-pointer-object replaced by designator */
+/*pointer-assignment-stmt: data-pointer-object opt-bounds-spec-list-par TOK_POINT_TO data-target line-break
+     | data-pointer-object '(' bounds-remapping-list ')' TOK_POINT_TO data-target line-break
+     | proc-pointer-object TOK_POINT_TO proc-target line-break
+     ;
+*/
+
+pointer-assignment-stmt: designator opt-bounds-spec-list-par TOK_POINT_TO data-target line-break
+     | designator '(' bounds-remapping-list ')' TOK_POINT_TO data-target line-break
+     | designator TOK_POINT_TO proc-target line-break
+     ;
+     
+/* R734 : data-pointer-object */
+data-pointer-object: variable-name
+     | scalar-variable '%' TOK_NAME
+     ;
+
+opt-bounds-spec-list-par:
+     | '(' bounds-spec-list ')'
+     ;
+
+bounds-spec-list:
+        bounds-spec
+      | bounds-spec-list ',' bounds-spec
+      ;
+
+bounds-remapping-list:
+        bounds-remapping
+      | bounds-remapping-list ',' bounds-remapping
+      ;
+      
+/* R735 : bounds-spec */
+bounds-spec: lower-bound-expr ':'
+     ;
+
+/* R736 : bounds-remapping */
+bounds-remapping: lower-bound-expr ':' upper-bound-expr
+     ;
+     
+/* R737 : data-target */
+data-target: variable
+     ;
+
+procedure-component-name: TOK_NAME
+     ;
+
+/* R738 : proc-pointer-object */
+proc-pointer-object: proc-pointer-name
+     | proc-component-ref
+     ;
+
+/* R739 : proc-component-ref */
+proc-component-ref : scalar-variable '%' procedure-component-name
+     ;
+     
+/* R740 : proc-target */
+proc-target: expr
+     | procedure-component-name
+     | proc-component-ref
+     ;
+
+/* R741 : where-stmt */
+where-stmt: TOK_WHERE '(' mask-expr ')' where-assignment-stmt
+      ;
+
+/* R742 : where-construct */
+where-construct: where-construct-stmt opt-where-body-construct opt-masked-elsewhere-construct opt-elsewhere-construct end-where-stmt
+      ;
+
+opt-where-body-construct:
+      | opt-where-body-construct where-body-construct
+      ;
+
+opt-masked-elsewhere-construct :
+      | opt-masked-elsewhere-construct masked-elsewhere-stmt opt-where-body-construct
+      ;
+
+opt-elsewhere-construct:
+      | opt-elsewhere-construct elsewhere-stmt opt-where-body-construct
+      ;
+
+/* R743 : where-construct-stmt */
+where-construct-stmt: TOK_WHERE '(' mask-expr ')' line-break
+      ;
+
+/* R744 : where-body-construct */
+where-body-construct: where-assignment-stmt
+      | where-stmt
+      | where-construct
+      ;
+
+/* R745 : where-assignment-stmt */
+where-assignment-stmt: assignment-stmt
+      ;
+
+/* R746 : mask-expr */
+mask-expr: expr
+      ;
+
+/* R747 : masked-elsewhere-stmt */
+masked-elsewhere-stmt: TOK_ELSEWHEREPAR mask-expr ')' line-break
+      | TOK_ELSEWHEREPAR mask-expr ')' TOK_NAME line-break
+      ;
+
+/* R748: elsewhere-stmt */
+elsewhere-stmt: TOK_ELSEWHERE line-break
+      | TOK_ELSEWHERE TOK_NAME line-break
+      ;
+
+/* R749: end-where-stmt */
+end-where-stmt:
+        TOK_ENDWHERE line-break
+      | TOK_ENDWHERE TOK_NAME line-break
+      ;
+
+/* R752 : forall-header */
+forall-header :
+     ;
+
+/* R801 : block */
+block: opt-execution-part-construct
+      ;
+
+opt-execution-part-construct:
+      | opt-execution-part-construct execution-part-construct
+      ;
+
+/* R813 : do-construct */
+do-construct:
+        block-do-construct
+      | nonblock-do-construct
+      ;
+
+do-construct:
+        block-do-construct
+      ;
+      
+/* R814 : block-do-construct */
+
+block-do-construct: label-do-stmt do-block end-do
+      | nonlabel-do-stmt do-block end-do
+      ;
+
+/* R815 : do-stmt */
+/*do-stmt:
+        label-do-stmt
+      | nonlabel-do-stmt
+      ;
+*/
+
+/* R816 : label-do-stmt */
+label-do-stmt: TOK_NAME ':' TOK_PLAINDO_LABEL line-break
+      |              TOK_PLAINDO_LABEL line-break
+      | TOK_NAME ':' TOK_PLAINDO_LABEL loop-control line-break
+      |              TOK_PLAINDO_LABEL loop-control line-break
+      ;
+      
+label-do-stmt-djview: TOK_NAME ':' TOK_PLAINDO_LABEL_DJVIEW line-break
+      |              TOK_PLAINDO_LABEL_DJVIEW line-break
+      | TOK_NAME ':' TOK_PLAINDO_LABEL_DJVIEW loop-control line-break
+      |              TOK_PLAINDO_LABEL_DJVIEW loop-control line-break
+      ;
+      
+/* R817 : nonlabel-do-stmt */
+nonlabel-do-stmt: TOK_NAME ':' TOK_PLAINDO line-break
+      |              TOK_PLAINDO line-break
+      | TOK_NAME ':' TOK_PLAINDO loop-control line-break
+      |              TOK_PLAINDO loop-control line-break
+      ;
+
+/* R818 : loop-control */
+loop-control:
+        opt_comma do-variable '=' expr ',' expr
+      | opt_comma do-variable '=' expr ',' expr ',' expr
+      | opt_comma TOK_WHILE '(' expr ')'
+      | opt_comma TOK_CONCURRENT forall-header
+      ;
+
+/* R819 : do-variable */
+do-variable: ident
+     ;
+
+/* R820 : do-block */
+do-block: block
+     ;
+
+/* R821 : end-do */
+/*end-do: end-do-stmt
+     | do-term-action-stmt
+     ;
+*/
+
+end-do: end-do-stmt
+     | label-djview continue-stmt
+     ;
+
+/* R822 : end-do-stmt */
+end-do-stmt: opt-label-djview TOK_ENDDO line-break
+      | opt-label-djview TOK_ENDDO TOK_NAME line-break
+      ;
+
+/* R823 : nonblock-do-construct */
+/* only outer-shared-do-construct is used */
+
+/*
+nonblock-do-construct: outer-shared-do-construct
+      ;
+*/
+
+nonblock-do-construct: action-term-do-construct
+      | outer-shared-do-construct
+      ;
+
+
+/* R824 : action-term-do-construct */
+
+action-term-do-construct: label-do-stmt do-block do-term-action-stmt
+      ;
+      
+/* R825 : do-body */
+
+do-body :
+      | execution-part-construct do-body
+      ;
+
+/* R826 : do-term-action-stmt */
+do-term-action-stmt:  label-djview do-term-action-stmt-special
+      ;
+
+/* do-term-action-stmt-special */
+do-term-action-stmt-special:
+      allocate-stmt
+      | assignment-stmt
+      | call-stmt
+      | close-stmt
+      | deallocate-stmt
+      | flush-stmt
+      | goto-stmt
+      | TOK_REWIND after_rewind
+      | TOK_NULLIFY '(' pointer_name_list ')'
+      | if-stmt
+      | inquire-stmt
+      | open-stmt
+      | print-stmt
+      | read-stmt
+      | rewind-stmt
+      | where-stmt
+      | write-stmt
+      ;
+
+
+/* R827 : outer-shared-do-construct */
+/* do-body is same as do-block 
+we extend the definition of outer-shared-do-construct
+a label-do-stmt statement must be followed by a label-do-stmt-djview statement
+*/
+
+outer-shared-do-construct : label-do-stmt do-block label-do-stmt-djview-do-block-list inner-shared-do-construct
+       | label-do-stmt do-block inner-shared-do-construct
+       ;
+
+label-do-stmt-djview-do-block-list: label-do-stmt-djview do-block
+       | label-do-stmt-djview-do-block-list label-do-stmt-djview do-block
+       ;
+
+/* R828 : shared-term-do-construct */
+
+shared-term-do-construct: outer-shared-do-construct
+      | inner-shared-do-construct
+      ;
+    
+/* R829 : inner-shared-do-construct */
+/* do-body is same as do-block */
+inner-shared-do-construct: label-do-stmt-djview do-block do-term-shared-stmt
+      ;
+      
+/* R830 : do-term-shared-stmt */
+
+do-term-shared-stmt: label-djview action-stmt
+      ;
+
+opt-do-construct-name:
+     | TOK_NAME
+     ;
+
+/* R831 : cycle-stmt */
+cycle-stmt: TOK_CYCLE opt-do-construct-name line-break
+     ;
+
+/* R832 : if-construct */
+if-construct: if-then-stmt block opt-else-if-stmt-block opt-else-stmt-block end-if-stmt
+      ;
+  
+opt-else-if-stmt-block: 
+      | else-if-stmt-block
+      | opt-else-if-stmt-block else-if-stmt-block
+      ;
+
+else-if-stmt-block: else-if-stmt block
+      ;
+
+opt-else-stmt-block: 
+      | else-stmt-block
+      | opt-else-stmt-block else-if-stmt-block
+      ;
+
+else-stmt-block: else-stmt block
+        ;
+
+/* R833 : if-then-stmt */
+if-then-stmt: TOK_NAME ':' TOK_LOGICALIF_PAR expr ')' TOK_THEN line-break
+      | label TOK_NAME ':' TOK_LOGICALIF_PAR expr ')' TOK_THEN line-break
+      | opt-label TOK_LOGICALIF_PAR expr ')' TOK_THEN line-break
+      ;
+
+/* R834 : else-if-stmt */
+else-if-stmt:TOK_ELSEIF '(' expr ')' TOK_THEN line-break
+      | TOK_ELSEIF '(' expr ')' TOK_THEN TOK_NAME line-break
+      ;
+
+/* R835 : else-stmt */
+else-stmt:TOK_ELSE line-break
+      | TOK_ELSE TOK_NAME line-break
+      ;
+
+/* R836 : end-if-stmt */
+end-if-stmt:TOK_ENDIF line-break
+      | TOK_ENDIF TOK_NAME line-break
+      ;
+
+/* R837 : if-stmt */
+if-stmt: opt-label TOK_LOGICALIF_PAR expr ')' action-stmt
+        ;
+
+/* R838 : case-construct */
+case-construct: select-case-stmt opt_case-stmt-block end-select-stmt
+        ;
+
+opt_case-stmt-block:
+        | case-stmt-block
+        | opt_case-stmt-block case-stmt-block
+        ;
+
+case-stmt-block: case-stmt block
+        ;
+
+/* R839 : select-case-stmt */
+select-case-stmt :TOK_NAME ':' TOK_SELECTCASE '(' expr ')' {in_select_case_stmt++;} line-break
+        |              TOK_SELECTCASE '(' expr ')' {in_select_case_stmt++;} line-break
+        ;
+
+/* R840 : case-stmt */
+case-stmt:TOK_CASE case-selector line-break
+        | TOK_CASE case-selector TOK_NAME line-break
+        ;
+
+/* R840 : end-select-stmt */
+end-select-stmt: TOK_ENDSELECT {in_select_case_stmt--;} line-break
+        | TOK_ENDSELECT TOK_NAME {in_select_case_stmt--;} line-break
+        ;
+
+/* R843 : case-selector */
+case-selector:
+          '(' {in_complex_literal=0;} case-value-range-list ')'
+        | TOK_DEFAULT
+        ;
+
+case-value-range-list:
+        case-value-range
+      | case-value-range-list ',' case-value-range
+      ;
+
+/* R844: case-value-range */
+case-value-range :
+        case-value
+      | case-value ':'
+      | ':' case-value
+      | case-value ':' case-value
+      ;
+
+/* R845 : case-value */
+case-value: expr
+        ;
+
+/* R850 : exit-stmt */
+exit-stmt: TOK_EXIT line-break
+       | TOK_EXIT TOK_NAME line-break
+       ;
+
+/* R851 : goto-stmt */
+goto-stmt: TOK_PLAINGOTO label line-break
+     ;
+
+/* R853 arithmetic-if-stmt */
+arithmetic-if-stmt: opt-label TOK_LOGICALIF_PAR expr ')' label ',' label ',' label line-break
+     ;
+
+/* R854 : continue-stmt */
+continue-stmt: opt-label TOK_CONTINUE line-break
+        ;
+
+/* R855 : stop-stmt */
+stop-stmt: TOK_STOP line-break
+     | TOK_STOP stop-code line-break
+     ;
+
+/* R857 : stop-code */
+stop-code: scalar-default-char-constant-expr
+    | scalar-int-constant-expr
+    ;
+
+/* R901 : io-unit */
+io-unit : file-unit-number
+        | '*'
+        | internal-file-variable
+        ;
+
+/* R902 : file-unit-number */
+file-unit-number : scalar-int-expr
+        ;
+
+/* R902 : internal-file-variable */
+internal-file-variable : char-variable
+        ;
+
+/* R904 : open-stmt */
+open-stmt: TOK_OPEN '(' {close_or_connect = 1;} connect-spec-list ')' {close_or_connect = 0;} line-break
+        ;
+
+connect-spec-list: connect-spec
+         | connect-spec-list ',' connect-spec
+         ;
+
+/* R905 : connect-spec */
+connect-spec: file-unit-number
+      | TOK_UNIT file-unit-number
+      | TOK_ACCESS scalar-default-char-expr
+      | TOK_ACTION scalar-default-char-expr
+      | TOK_ERR label
+      | TOK_FILE file-name-expr
+      | TOK_FORM scalar-default-char-expr
+      | TOK_IOSTAT scalar-int-variable
+      | TOK_POSITION scalar-default-char-expr
+      | TOK_RECL scalar-int-expr
+      | TOK_STATUS '=' scalar-default-char-expr
+      ;
+
+/* R906 : file-name-expr */
+file-name-expr: scalar-default-char-expr
+     ;
+
+/* R907 : iomsg-variable */
+iomsg-variable: scalar-default-char-variable
+     ;
+
+/* R908 : close-stmt */
+close-stmt: opt-label TOK_CLOSE '(' {close_or_connect = 1;} close-spec-list ')' line-break
+        {close_or_connect = 0;}
+        ;
+
+close-spec-list: close-spec
+         | close-spec-list ',' close-spec
+         ;
+
+/* R909 : close-spec */
+close-spec: file-unit-number
+       | TOK_UNIT file-unit-number
+       | TOK_IOSTAT scalar-int-variable
+       | TOK_ERR label
+       | TOK_STATUS '=' scalar-default-char-expr
+       ;
+
+/* R910 : read-stmt */
+read-stmt: opt-label TOK_READ_PAR io-control-spec-list ')'
+         {
+         in_io_control_spec = 0;
+         }
+         line-break
+        | opt-label TOK_READ_PAR io-control-spec-list ')' input-item-list
+         {
+         in_io_control_spec = 0;
+         }
+         line-break
+        | opt-label TOK_READ format line-break
+        | opt-label TOK_READ format ',' input-item-list line-break
+        ;
+        
+/* R911 : write-stmt */
+write-stmt: opt-label TOK_WRITE_PAR io-control-spec-list ')'
+         {
+         in_io_control_spec = 0;
+         }
+         line-break
+        | opt-label TOK_WRITE_PAR io-control-spec-list ')'  output-item-list
+         {
+         in_io_control_spec = 0;
+         }
+         line-break
+        ;
+
+/* R912 : print-stmt */
+print-stmt: opt-label TOK_PRINT format line-break
+        | opt-label TOK_PRINT format ',' output-item-list line-break
+        ;
+io-control-spec-list: io-control-spec
+         | io-control-spec-list ',' io-control-spec
+         ;
+
+namelist-group-name: TOK_NAME
+         ;
+
+/* R913 : io-control-spec */
+io-control-spec: io-unit
+         | TOK_UNIT io-unit
+         | format
+         | namelist-group-name
+         | TOK_NML namelist-group-name
+         | TOK_FMT format
+         | TOK_END label
+         | TOK_EOR label
+         | TOK_ERR label
+         | TOK_IOSTAT scalar-int-variable
+         | TOK_REC '=' scalar-int-expr
+        ;
+
+/* R915 : format */
+format: default-char-expr
+        | label
+        | '*'
+        ;
+input-item-list:
+         input-item
+         | input-item-list ',' input-item
+         ;
+/* R916 : input-item */
+input-item: variable
+        | io-implied-do
+        ;
+
+output-item-list:
+         output-item
+         | output-item-list ',' output-item
+         ;
+
+/* R917 : output-item */
+output-item: expr
+        | io-implied-do
+        ;
+
+/* R918 : io-implied-do */
+io-implied-do : '(' io-implied-do-object-list ',' io-implied-do-control ')'
+        ;
+
+io-implied-do-object-list: io-implied-do-object
+         | io-implied-do-object-list ',' io-implied-do-object
+         ;
+
+/* R919 : io-implied-do-object */
+/* input-item removed since possible conflicts (output-item can be variable) */
+/* io-implied-do-object : input-item
+        | output-item
+        ;
+*/
+
+io-implied-do-object : output-item
+        ;        
+
+/* R920 : io-implied-do-control */
+io-implied-do-control: do-variable '=' scalar-int-expr ',' scalar-int-expr
+        | do-variable '=' scalar-int-expr ',' scalar-int-expr ',' scalar-int-expr
+        ;
+
+/* R926 : rewind-stmt */
+rewind-stmt: TOK_REWIND file-unit-number line-break
+     | TOK_REWIND '(' position-spec-list ')' line-break
+     ;
+
+position-spec-list:
+        position-spec
+      | position-spec-list ',' position-spec
+      ;
+      
+/* R927 : position-spec */
+position-spec: file-unit-number
+     | TOK_UNIT file-unit-number
+     | TOK_IOMSG iomsg-variable
+     | TOK_IOSTAT scalar-int-variable
+     | TOK_ERR label
+     ;
+
+/* R928 : flush-stmt */
+flush-stmt: TOK_FLUSH file-unit-number line-break
+     | TOK_FLUSH '(' flush-spec-list ')' line-break
+     ;
+
+flush-spec-list:
+        flush-spec
+      | flush-spec-list ',' flush-spec
+      ;
+      
+/* R929 : flush-spec */
+flush-spec: file-unit-number
+     | TOK_UNIT file-unit-number
+     | TOK_IOSTAT scalar-int-variable
+     | TOK_IOMSG iomsg-variable
+     | TOK_ERR label
+     ;
+
+
+/* R930 : inquire-stmt */
+inquire-stmt: TOK_INQUIRE set_in_inquire '(' inquire-spec-list ')'
+     {in_inquire=0;}
+     line-break
+     | TOK_INQUIRE set_in_inquire '(' TOK_IOLENGTH scalar-int-variable ')' output-item-list
+     {in_inquire=0;}
+     line-break
+     ;
+
+set_in_inquire: {in_inquire=1;}  
+     ;
+
+inquire-spec-list:
+        inquire-spec
+      | inquire-spec-list ',' inquire-spec
+      ;
+      
+/* R931 : inquire-spec */
+inquire-spec: file-unit-number
+     | TOK_UNIT file-unit-number
+     | TOK_FILE file-name-expr
+     | TOK_ACCESS scalar-default-char-variable
+     | TOK_ACTION scalar-default-char-variable
+     | TOK_ERR label
+     | TOK_EXIST scalar-logical-variable
+     | TOK_IOSTAT scalar-int-variable
+     | TOK_NAME_EQ '=' scalar-default-char-variable
+     | TOK_OPENED scalar-logical-variable
+     | TOK_RECL scalar-int-variable
+     ;
+
+/* R1001 : format-stmt */
+format-stmt: TOK_LABEL_FORMAT line-break
+        ;
+
+/* R1104 : module */
+module:module-stmt opt-specification-part opt-module-subprogram-part {pos_endsubroutine=setposcur();} end-module-stmt
+     ;
+
+opt-module-subprogram-part:
+     | module-subprogram-part
+     ;
+
+/* R1105 : module-stmt */
+module-stmt : TOK_MODULE TOK_NAME
+        {
+            GlobalDeclaration = 0;
+            strcpy(curmodulename,$2);
+            strcpy(subroutinename,"");
+            Add_NameOfModule_1($2);
+            if ( inmoduledeclare == 0 )
+            {
+                /* To know if there are in the module declaration    */
+                inmoduledeclare = 1;
+                /* to know if a module has been met                  */
+                inmodulemeet = 1;
+                /* to know if we are after the keyword contains      */
+                aftercontainsdeclare = 0 ;
+            }
+        }
+        line-break
+     ;
+
+/* R1106 : end-module-stmt */
+end-module-stmt: get_my_position TOK_ENDUNIT opt-tok-module opt-ident
+        {
+            /* if we never meet the contains keyword               */
+            if ( firstpass == 0 )
+            {
+                RemoveWordCUR_0(fortran_out, setposcur()-my_position);    // Remove word "end module"
+                if ( inmoduledeclare && ! aftercontainsdeclare )
+                {
+                    Write_Closing_Module(1);
+                }
+                fprintf(fortran_out,"\n      end module %s\n", curmodulename);
+                if ( module_declar && insubroutinedeclare == 0 )
+                {
+                    fclose(module_declar);
+                }
+            }
+            inmoduledeclare = 0 ;
+            inmodulemeet = 0 ;
+            aftercontainsdeclare = 1;
+            strcpy(curmodulename, "");
+            GlobalDeclaration = 0 ;
+        }
+        line-break
+     ;
+
+opt-tok-module:
+     | TOK_MODULE
+     ;
+
+opt-ident:
+     | TOK_NAME
+     ;
+/* R1107 : module-subprogram-part */
+module-subprogram-part:contains-stmt opt-module-subprogram-list
+     ;
+     
+opt-module-subprogram-list:
+     | module-subprogram-list
+     ;
+     
+module-subprogram-list: module-subprogram
+     | module-subprogram-list module-subprogram
+     ;
+
+module-subprogram: function-subprogram
+     | subroutine-subprogram
+     ;
+
+use-stmt-list:use-stmt
+     | use-stmt-list use-stmt
+     ;
+
+save_olduse:
+     {if (firstpass == 0 && oldfortran_out) pos_curuseold = setposcurname(oldfortran_out);}
+     ;
+     
+/* R1109 use-stmt */
+use-stmt: get_my_position TOK_USE save_olduse opt-module-nature-2points TOK_NAME opt-rename-list
+    {
             if ( firstpass )
             {
                 if ( insubroutinedeclare )
                 {
-                    Add_CouplePointed_Var_1($2,$4);
-                    coupletmp = $4;
-                    strcpy(ligne,"");
-                    while ( coupletmp )
-                    {
+                    if ($6) {
+                      Add_CouplePointed_Var_1($5,$6);
+                      coupletmp = $6;
+                      strcpy(ligne,"");
+                      while ( coupletmp )
+                      {
                         strcat(ligne, coupletmp->c_namevar);
                         strcat(ligne, " => ");
@@ -1367 +4018 @@
                         coupletmp = coupletmp->suiv;
                         if ( coupletmp ) strcat(ligne,",");
+                      }
+                      }
+                  sprintf(charusemodule,"%s",$5);
+                }
+                Add_NameOfModuleUsed_1($5);
+            }
+            else
+            {
+                if ( insubroutinedeclare )
+                {
+                  copyuse_0($5);
                     }
-                    sprintf(charusemodule,"%s",$2);
-                }
-                Add_NameOfModuleUsed_1($2);
-            }
-            if ( inmoduledeclare == 0 )
-            {
-                pos_end = setposcur();
-                RemoveWordSET_0(fortran_out,pos_curuse,pos_end-pos_curuse);
-            }
-        }
-      | word_use TOK_NAME ',' TOK_ONLY ':' '\n'
-        {
-            /* if variables has been declared in a subroutine       */
-            sprintf(charusemodule,"%s",$2);
-            if ( firstpass )
-            {
-                Add_NameOfModuleUsed_1($2);
-            }
-            else
-            {
-                if ( insubroutinedeclare )
-                    copyuseonly_0($2);
 
                 if ( inmoduledeclare == 0 )
                 {
                     pos_end = setposcur();
-                    RemoveWordSET_0(fortran_out,pos_curuse,pos_end-pos_curuse);
+                    RemoveWordSET_0(fortran_out,my_position,pos_end-my_position);
                 }
             }
-        }
-      | word_use  TOK_NAME ',' TOK_ONLY ':' only_list
-        {
-            /* if variables has been declared in a subroutine      */
+    }
+    line-break
+    | get_my_position TOK_USE save_olduse opt-module-nature-2points TOK_NAME ',' TOK_ONLY ':' opt-only-list
+    {
             if ( firstpass )
             {
                 if ( insubroutinedeclare )
                 {
-                    Add_CouplePointed_Var_1($2,$6);
-                    coupletmp = $6;
+                  if ($9)
+                  {
+                    Add_CouplePointed_Var_1($5,$9);
+                    coupletmp = $9;
                     strcpy(ligne,"");
                     while ( coupletmp )
@@ -1416 +4058 @@
                         if ( coupletmp ) strcat(ligne,",");
                     }
-                    sprintf(charusemodule,"%s",$2);
+                  }
+                  sprintf(charusemodule,"%s",$5);
                 }
-                Add_NameOfModuleUsed_1($2);
-            }
-            else /* if ( firstpass == 0 ) */
-            {
+                Add_NameOfModuleUsed_1($5);
+            }
+            else
+            {
+                if ( insubroutinedeclare )
+                    copyuseonly_0($5);
+
                 if ( inmoduledeclare == 0 )
                 {
                     pos_end = setposcur();
-                    RemoveWordSET_0(fortran_out,pos_curuse,pos_end-pos_curuse);
-                    if (oldfortran_out)  variableisglobalinmodule($6,$2,oldfortran_out,pos_curuseold);
+                    RemoveWordSET_0(fortran_out,my_position,pos_end-my_position);
+                    if ($9)
+                    {
+                    if (oldfortran_out)  variableisglobalinmodule($9,$5,oldfortran_out,pos_curuseold);
+                    }
                 }
                 else
                 {
+                  if ($9)
+                  {
                     /* if we are in the module declare and if the    */
                     /* onlylist is a list of global variable         */
-                    variableisglobalinmodule($6, $2, fortran_out,pos_curuse);
+                    variableisglobalinmodule($9, $5, fortran_out,my_position);
+                  }
                 }
             }
-        }
-      ;
-word_use :
-        TOK_USE
-        {
-            pos_curuse = setposcur()-strlen($1);
-            if (firstpass == 0 && oldfortran_out) pos_curuseold = setposcurname(oldfortran_out);
-        }
-      ;
-rename_list :
-        rename_name
-        {
-            $$ = $1;
-        }
-      | rename_list ',' rename_name
-        {
-            /* insert the variable in the list $1                 */
-            $3->suiv = $1;
-            $$ = $3;
-        }
-      ;
-rename_name : TOK_NAME TOK_POINT_TO TOK_NAME
+    }
+    line-break
+    ;
+
+opt-module-nature-2points:
+    | TOK_FOURDOTS
+    | ',' module-nature TOK_FOURDOTS
+    ;
+
+opt-only-list:
+    {$$=NULL;}
+    | only-list
+    {$$=$1;}
+    ;
+
+/* R1101 : main-program */
+main-program: program-stmt opt-specification-part opt-execution-part opt-internal-subprogram-part end-program-stmt
+     ;
+
+opt-specification-part:
+     | specification-part
+     ;
+
+opt-execution-part:
+     | execution-part
+     ;
+
+/* R1102 : program-stmt */
+program-stmt: TOK_PROGRAM TOK_NAME 
+        {
+            strcpy(subroutinename,$2);
+            insubroutinedeclare = 1;
+            inprogramdeclare = 1;
+            /* in the second step we should write the head of       */
+            /*    the subroutine sub_loop_<subroutinename>          */
+            if ( ! firstpass )
+                WriteBeginof_SubLoop();
+        }
+        line-break
+     ;
+
+/* R1103 : end-program-stmt */
+end-program-stmt: {pos_endsubroutine=my_position_before;} TOK_ENDUNIT opt-tok-program opt-tok-name
+     {
+            insubroutinedeclare = 0;
+            inprogramdeclare = 0;
+            pos_cur = setposcur();
+            closeandcallsubloopandincludeit_0(3);
+            functiondeclarationisdone = 0;
+            strcpy(subroutinename,"");     
+     }     
+     line-break
+     ;
+
+opt-tok-program:
+     | TOK_PROGRAM
+     ;
+opt-tok-name:
+     | TOK_NAME
+     ;
+/* R1110 : module-nature */
+module-nature: TOK_INTRINSIC
+    ;
+
+opt-rename-list:
+    {
+    $$=NULL;
+    }
+    | ',' rename-list
+    {
+    $$=$2;
+    }
+    ;
+    
+rename-list: rename
+     {
+     $$=$1;
+     }
+     | rename-list ',' rename
+     {
+     /* insert the variable in the list $1                 */
+     $3->suiv = $1;
+     $$=$3;
+     }
+     ;
+
+/* R1111: rename */
+rename: TOK_NAME TOK_POINT_TO TOK_NAME
         {
             coupletmp = (listcouple *) calloc(1,sizeof(listcouple));
@@ -1464 +4182 @@
             $$ = coupletmp;
         }
-      ;
-only_list :
-        only_name   {  $$ = $1; }
-      | only_list ',' only_name
+     ;
+
+only-list:only
+     {$$=$1;}
+     | only-list ',' only
         {
             /* insert the variable in the list $1                 */
@@ -1473 +4192 @@
             $$ = $3;
         }
-      ;
-only_name :
-        TOK_NAME TOK_POINT_TO TOK_NAME
-        {
-            coupletmp = (listcouple *)calloc(1,sizeof(listcouple));
-            strcpy(coupletmp->c_namevar,$1);
-            strcpy(coupletmp->c_namepointedvar,$3);
-            coupletmp->suiv = NULL;
-            $$ = coupletmp;
-            pointedvar = 1;
-            Add_UsedInSubroutine_Var_1($1);
-        }
-      | TOK_NAME
+     ;
+
+/* R1112: only */
+only:generic-spec
         {
             coupletmp = (listcouple *)calloc(1,sizeof(listcouple));
@@ -1493 +4203 @@
             $$ = coupletmp;
         }
-      ;
-
-/* R209 : execution-part-construct */
-execution-part-construct:
-        executable-construct
-      | format-stmt
-      ;
-
-/* R213 : executable-construct */
-executable-construct:
-        action-stmt
-      | do-construct
-      | case-construct
-      | if-construct
-      | where-construct
-      ;
-
-/* R214 : action-stmt */
-action-stmt :
-        TOK_CONTINUE
-      | ident_dims after_ident_dims
-      | goto
-      | call
-      | iofctl ioctl
-      | read option_read
-      | TOK_WRITE ioctl
-      | TOK_WRITE ioctl outlist
-      | TOK_REWIND after_rewind
-      | TOK_ALLOCATE '(' allocation_list opt_stat_spec ')'          { inallocate = 0; }
-      | TOK_DEALLOCATE '(' allocate_object_list opt_stat_spec ')'   { inallocate = 0; }
-      | TOK_EXIT optexpr
-      | TOK_RETURN opt_expr
-      | TOK_CYCLE opt_expr
-      | stop opt_expr
-      | int_list
-      | TOK_NULLIFY '(' pointer_name_list ')'
-      | word_endunit
-        {
+     | only-use-name
+        {
+            coupletmp = (listcouple *)calloc(1,sizeof(listcouple));
+            strcpy(coupletmp->c_namevar,$1);
+            strcpy(coupletmp->c_namepointedvar,"");
+            coupletmp->suiv = NULL;
+            $$ = coupletmp;
+        }
+     | rename
+     {
+     $$=$1;
+     pointedvar = 1;
+      Add_UsedInSubroutine_Var_1($1->c_namevar);
+     }
+     ;
+/* R1113 : only-use-name */
+only-use-name: TOK_NAME
+     ;
+
+/* R1207: generic-spec */
+generic-spec: TOK_NAME
+     ;
+
+/* R1210 : external-stmt */
+external-stmt: TOK_EXTERNAL external-name-list line-break
+     | TOK_EXTERNAL TOK_FOURDOTS external-name-list line-break
+     ;
+     
+external-name-list: external-name
+     | external-name-list ',' external-name
+     ;
+     
+external-name: TOK_NAME
+     ;
+
+/* R1218 : intrinsic-stmt */
+intrinsic-stmt: TOK_INTRINSIC opt-TOK_FOURDOTS intrinsic-procedure-name-list line-break
+     ;
+
+intrinsic-procedure-name-list:
+        intrinsic-procedure-name
+      | intrinsic-procedure-name-list ',' intrinsic-procedure-name
+      ;
+      
+intrinsic-procedure-name: TOK_NAME
+     ;
+
+/* R1219 : function-reference */
+function-reference: procedure-designator '(' ')'
+     | procedure-designator '(' {in_complex_literal=0;} actual-arg-spec-list ')'
+     {sprintf($$,"%s(%s)",$[procedure-designator],$[actual-arg-spec-list]);}
+     ;
+
+/* R1220 : 
+*/
+call-stmt: before-call-stmt
+             {
+            inagrifcallargument = 0 ;
+            incalldeclare=0;
+            if ( oldfortran_out && (callagrifinitgrids == 1) && (firstpass == 0) )
+            {
+                pos_end = setposcur();
+                RemoveWordSET_0(fortran_out,pos_curcall,pos_end-pos_curcall);
+                strcpy(subofagrifinitgrids,subroutinename);
+            }
+            Instanciation_0(sameagrifname);
+        }
+        line-break
+     | before-call-stmt '(' ')'
+             {
+            inagrifcallargument = 0 ;
+            incalldeclare=0;
+            if ( oldfortran_out && (callagrifinitgrids == 1) && (firstpass == 0) )
+            {
+                pos_end = setposcur();
+                RemoveWordSET_0(fortran_out,pos_curcall,pos_end-pos_curcall);
+                strcpy(subofagrifinitgrids,subroutinename);
+            }
+            Instanciation_0(sameagrifname);
+        }
+        line-break
+     | before-call-stmt '(' {in_complex_literal=0;} actual-arg-spec-list ')'
+        {
+            inagrifcallargument = 0 ;
+            incalldeclare=0;
+            if ( oldfortran_out && (callagrifinitgrids == 1) && (firstpass == 0) )
+            {
+                pos_end = setposcur();
+                RemoveWordSET_0(fortran_out,pos_curcall,pos_end-pos_curcall);
+                strcpy(subofagrifinitgrids,subroutinename);
+            }
+            Instanciation_0(sameagrifname);
+        }
+        line-break
+     ;
+
+before-call-stmt: opt-label TOK_CALL {pos_curcall=my_position_before-strlen($[opt-label])-4;} procedure-designator
+             {
+            if (!strcasecmp($[procedure-designator],"MPI_Init") )    callmpiinit = 1;
+            else                                callmpiinit = 0;
+
+            if (!strcasecmp($[procedure-designator],"Agrif_Init_Grids") )
+            {
+                callagrifinitgrids = 1;
+                strcpy(meetagrifinitgrids,subroutinename);
+            }
+            else
+            {
+                callagrifinitgrids = 0;
+            }
+            if ( Vartonumber($[procedure-designator]) == 1 )
+            {
+                incalldeclare = 0;
+                inagrifcallargument = 0 ;
+                Add_SubroutineWhereAgrifUsed_1(subroutinename, curmodulename);
+            }
+        }
+        ;
+
+/* R1221 : procedure-designator */
+procedure-designator: ident
+     | TOK_FLUSH
+     | TOK_REAL
+     ;
+
+actual-arg-spec-list:
+        actual-arg-spec
+      | actual-arg-spec-list ',' actual-arg-spec
+      {sprintf($$,"%s,%s",$1,$[actual-arg-spec]);}
+      ;
+
+/* R1222 : actual-arg-spec */
+actual-arg-spec: actual-arg
+        {
+            if ( callmpiinit == 1 )
+            {
+                strcpy(mpiinitvar,$1);
+                if ( firstpass == 1 )  Add_UsedInSubroutine_Var_1 (mpiinitvar);
+            }
+        }     
+     | keyword '=' actual-arg
+     {sprintf($$,"%s = %s",$1,$3);
+                 if ( callmpiinit == 1 )
+            {
+                strcpy(mpiinitvar,$3);
+                if ( firstpass == 1 )  Add_UsedInSubroutine_Var_1 (mpiinitvar);
+            }
+            }
+     ;
+
+/* R1223 : actual-arg */
+actual-arg: expr
+     | variable
+     {
+     strcpy($$,$1->v_nomvar);
+     if ($1->v_initialvalue_array)
+     {
+     strcat($$,"(");
+     strcat($$,$1->v_initialvalue_array->n_name);
+     strcat($$,")");
+     }
+     }
+     | ident
+     ;
+
+opt-prefix:     {isrecursive = 0;}
+     | prefix
+     ;
+     
+/* R1225 : prefix */
+prefix: prefix-spec
+     | prefix prefix-spec
+     ;
+
+/* R1226 prefix-spec */
+prefix-spec: declaration-type-spec
+     {isrecursive = 0; functiondeclarationisdone = 1;}
+     | TOK_MODULE
+     {isrecursive = 0;}
+     | TOK_RECURSIVE
+     {isrecursive = 1;}
+     ;
+
+/*R1227 : function-subprogram */
+function-subprogram: function-stmt opt-specification-part opt-execution-part opt-internal-subprogram-part end-function-stmt
+     ;
+
+/* R1228 : function-stmt */
+function-stmt: opt-prefix TOK_FUNCTION
+     function-name '(' {in_complex_literal=0;} opt-dummy-arg-list ')' opt-suffix
+     {
+            insubroutinedeclare = 1;
+            suborfun = 0;
+            /* we should to list of the subroutine argument the  */
+            /*    name of the function which has to be defined   */
+            if ( firstpass )
+            {
+                Add_SubroutineArgument_Var_1($[opt-dummy-arg-list]);
+                if ( ! is_result_present )
+                    Add_FunctionType_Var_1($[function-name]);
+            }
+            else
+            /* in the second step we should write the head of    */
+            /*    the subroutine sub_loop_<subroutinename>       */
+               {
+                if (todebug == 1) fprintf(fortran_out,"      !DEBUG: Avant Writebeginof subloop\n");
+                WriteBeginof_SubLoop();
+                if (todebug == 1) fprintf(fortran_out,"      !DEBUG: Apres Writebeginof subloop\n");
+                }
+                strcpy(NamePrecision,"");
+     }
+     line-break
+     ;
+
+function-name: TOK_NAME
+     {
+     if (strcmp(subroutinename,""))
+     {
+     strcpy(old_subroutinename,subroutinename); // can occur in internal-subprogram
+     old_oldfortran_out=oldfortran_out;
+     }
+     else
+     {
+     old_oldfortran_out=(FILE *)NULL;
+     }
+     strcpy($$,$1);strcpy(subroutinename,$1);
+     }
+     ;
+
+opt-dummy-arg-name-list:
+     | dummy-arg-name-list
+     ;
+
+dummy-arg-name-list:
+        dummy-arg-name
+      | dummy-arg-name-list ',' dummy-arg-name
+      ;
+
+/* R1230 : dummy-arg-name */
+dummy-arg-name: TOK_NAME
+     {strcpy($$,$1);}
+     ;
+
+opt-suffix:
+     {is_result_present = 0; }
+     | suffix
+     ;
+     
+/* R1231 : suffix */
+suffix: TOK_RESULT '(' TOK_NAME ')'
+     {is_result_present = 1;
+                 if ( firstpass == 1 )
+            {
+                strcpy(nameinttypenameback,nameinttypename);
+                strcpy(nameinttypename,"");
+                curvar = createvar($3,NULL);
+                strcpy(nameinttypename,nameinttypenameback);
+                strcpy(curvar->v_typevar,"");
+                curlistvar = insertvar(NULL,curvar);
+                Add_SubroutineArgument_Var_1(curlistvar);
+            }
+     }
+     ;
+
+/* R1232 : end-function-stmt */
+end-function-stmt: get_my_position TOK_ENDUNIT opt-tok-function opt-ident close_subroutine
+     {strcpy(DeclType, "");}
+     line-break
+     ;
+
+opt-tok-function:
+     | TOK_FUNCTION
+     ;
+
+/*R1233 : subroutine-subprogram */
+subroutine-subprogram: subroutine-stmt opt-specification-part opt-execution-part opt-internal-subprogram-part end-subroutine-stmt
+     ;
+     
+/* R1234 : subroutine-stmt */
+subroutine-stmt: opt-prefix TOK_SUBROUTINE subroutine-name opt-dummy-arg-list-par
+        {
+            insubroutinedeclare = 1;
+            suborfun = 1;
+            if ( firstpass )
+                Add_SubroutineArgument_Var_1($4);
+            else
+              {
+                WriteBeginof_SubLoop();
+              }
+        }
+        line-break
+     ;
+
+
+subroutine-name: TOK_NAME
+     {
+     if (strcmp(subroutinename,""))
+     {
+     strcpy(old_subroutinename,subroutinename); // can occur in internal-subprogram
+     old_oldfortran_out=oldfortran_out;
+     }
+     else
+     {
+     old_oldfortran_out=(FILE *)NULL;
+     }
+     strcpy($$,$1);strcpy(subroutinename,$1);
+     }
+     ;
+
+/* R1236 : end-subroutine-stmt */
+
+end-subroutine-stmt: get_my_position TOK_ENDUNIT opt-tok-subroutine opt-ident close_subroutine
+     line-break
+     ;
+
+close_subroutine:
+          {pos_endsubroutine = my_position;
             GlobalDeclaration = 0 ;
             if ( firstpass == 0 && strcasecmp(subroutinename,"") )
@@ -1546 +4535 @@
                         insubroutinedeclare = 0 ;
                         pos_cur = setposcur();
-                        closeandcallsubloopandincludeit_0(1);
+                        closeandcallsubloopandincludeit_0(suborfun);
                         functiondeclarationisdone = 0;
                     }
@@ -1565 +4554 @@
             }
             strcpy(subroutinename,"");
-        }
-      | word_endprogram opt_name
-        {
-            insubroutinedeclare = 0;
-            inprogramdeclare = 0;
-            pos_cur = setposcur();
-            closeandcallsubloopandincludeit_0(3);
-            functiondeclarationisdone = 0;
-            strcpy(subroutinename,"");
-        }
-      | word_endsubroutine opt_name
-        {
-            if ( strcasecmp(subroutinename,"") )
-            {
-                insubroutinedeclare = 0;
-                pos_cur = setposcur();
-                closeandcallsubloopandincludeit_0(1);
-                functiondeclarationisdone = 0;
-                strcpy(subroutinename,"");
-            }
-        }
-      | word_endfunction opt_name
-        {
-            insubroutinedeclare = 0;
-            pos_cur = setposcur();
-            closeandcallsubloopandincludeit_0(0);
-            functiondeclarationisdone = 0;
-            strcpy(subroutinename,"");
-        }
-      | TOK_ENDMODULE opt_name
-        {
-            /* if we never meet the contains keyword               */
-            if ( firstpass == 0 )
-            {
-                RemoveWordCUR_0(fortran_out, strlen($2)+11);    // Remove word "end module"
-                if ( inmoduledeclare && ! aftercontainsdeclare )
-                {
-                    Write_Closing_Module(1);
-                }
-                fprintf(fortran_out,"\n      end module %s\n", curmodulename);
-                if ( module_declar && insubroutinedeclare == 0 )
-                {
-                    fclose(module_declar);
-                }
-            }
-            inmoduledeclare = 0 ;
-            inmodulemeet = 0 ;
-            aftercontainsdeclare = 1;
-            strcpy(curmodulename, "");
-            GlobalDeclaration = 0 ;
-        }
-      | if-stmt
-      | where-stmt
-      | TOK_CONTAINS
+            if (strcmp(old_subroutinename,""))
+            {
+            strcpy(subroutinename,old_subroutinename);
+            strcpy(old_subroutinename,"");
+            oldfortran_out=old_oldfortran_out;
+            insubroutinedeclare=1;
+            }
+        }
+        ;
+opt-tok-subroutine:
+     | TOK_SUBROUTINE
+     ;
+
+opt-dummy-arg-list-par:
+     {if (firstpass) $$=NULL;}
+     | '(' {in_complex_literal=0;} opt-dummy-arg-list ')'
+     {if (firstpass) $$=$3;}
+     ;
+
+opt-dummy-arg-list:
+     {if (firstpass) $$=NULL;}
+     | dummy-arg-list
+     {if (firstpass) $$=$1;}
+     ;
+     
+dummy-arg-list:
+        dummy-arg
+        {
+            if ( firstpass == 1 )
+            {
+                strcpy(nameinttypenameback,nameinttypename);
+                strcpy(nameinttypename,"");
+                curvar = createvar($1,NULL);
+                strcpy(nameinttypename,nameinttypenameback);
+                curlistvar = insertvar(NULL,curvar);
+                $$ = settype("",curlistvar);
+            }
+        }
+      | dummy-arg-list ',' dummy-arg
+        {
+            if ( firstpass == 1 )
+            {
+                strcpy(nameinttypenameback,nameinttypename);
+                strcpy(nameinttypename,"");
+                curvar = createvar($3,NULL);
+                strcpy(nameinttypename,nameinttypenameback);
+                $$ = insertvar($1,curvar);
+            }
+        }
+      ;
+      
+/* R1235: dummy-arg */
+dummy-arg: dummy-arg-name
+      {strcpy($$,$1);}
+      | '*'
+      {strcpy($$,"*");}
+      ;
+      
+/* R1241 : return-stmt */
+return-stmt : opt-label TOK_RETURN line-break
+     | opt-label TOK_RETURN scalar-int-expr line-break
+     ;
+
+/* R1242 : contains-stmt */
+contains-stmt: opt-label TOK_CONTAINS
         {
             if ( inside_type_declare ) break;
@@ -1647 +4647 @@
             else printf("l.%4d -- TOK_CONTAINS -- MHCHECK\n",line_num_input);
         }
-      ;
-
-/* R601 : variable */
-//variable : expr
-//       ;
-
-/* R734 : assignment-stmt */
-// assignment-stmt: variable '=' expr
-//       ;
-assignment-stmt: expr
-      ;
-
-/* R741 : where-stmt */
-where-stmt: TOK_WHERE '(' mask-expr ')' where-assignment-stmt
-      ;
-
-/* R742 : where-construct */
-where-construct: where-construct-stmt line-break opt-where-body-construct opt-masked-elsewhere-construct opt-elsewhere-construct end-where-stmt
-      ;
-
-opt-where-body-construct:
-      | opt-where-body-construct where-body-construct line-break
-      ;
-
-opt-masked-elsewhere-construct :
-      | opt-masked-elsewhere-construct masked-elsewhere-stmt line-break opt-where-body-construct
-      ;
-
-opt-elsewhere-construct:
-      | opt-elsewhere-construct elsewhere-stmt line-break opt-where-body-construct
-      ;
-
-/* R743 : where-construct-stmt */
-where-construct-stmt:
-        TOK_WHERE '(' mask-expr ')'
-      ;
-
-/* R744 : where-body-construct */
-where-body-construct: where-assignment-stmt
-      | where-stmt
-      | where-construct
-      ;
-
-/* R745 : where-assignment-stmt */
-where-assignment-stmt: assignment-stmt
-      ;
-
-/* R746 : mask-expr */
-mask-expr: expr
-      ;
-
-/* R747 : masked-elsewhere-stmt */
-masked-elsewhere-stmt:
-        TOK_ELSEWHEREPAR mask-expr ')'
-      | TOK_ELSEWHEREPAR mask-expr ')' TOK_NAME
-      ;
-
-/* R748: elsewhere-stmt */
-elsewhere-stmt:
-        TOK_ELSEWHERE
-      | TOK_ELSEWHERE TOK_NAME
-      ;
-
-/* R749: end-where-stmt */
-end-where-stmt:
-        TOK_ENDWHERE
-      | TOK_ENDWHERE TOK_NAME
-      ;
-
-/* R752 : forall-header */
-forall-header :
-     ;
-
-/* R801 : block */
-block:
-      |block execution-part-construct
-      |block execution-part-construct line-break
-      ;
-
-/* R813 : do-construct */
-do-construct:
-        block-do-construct
-      ;
-
-/* R814 : block-do-construct */
-block-do-construct:
-        do-stmt line-break do-block end-do
-      ;
-
-/* R815 : do-stmt */
-do-stmt:
-        label-do-stmt
-      | nonlabel-do-stmt
-      ;
-
-/* R816 : label-do-stmt */
-label-do-stmt:
-        TOK_NAME ':' TOK_PLAINDO label
-      |              TOK_PLAINDO label
-      | TOK_NAME ':' TOK_PLAINDO label loop-control
-      |              TOK_PLAINDO label loop-control
-      ;
-
-/* R817 : nonlabel-do-stmt */
-nonlabel-do-stmt:
-        TOK_NAME ':' TOK_PLAINDO
-      |              TOK_PLAINDO
-      | TOK_NAME ':' TOK_PLAINDO loop-control
-      |              TOK_PLAINDO loop-control
-      ;
-
-/* R818 : loop-control */
-loop-control:
-        opt_comma do-variable '=' expr ',' expr
-      | opt_comma do-variable '=' expr ',' expr ',' expr
-      | opt_comma TOK_WHILE '(' expr ')'
-      | opt_comma TOK_CONCURRENT forall-header
-      ;
-
-/* R819 : do-variable */
-do-variable : ident
-     ;
-
-/* R820 : do-block */
-do-block: block
-     ;
-
-/* R821 : end-do */
-end-do: end-do-stmt
-     | continue-stmt
-     ;
-
-/* R822 : end-do-stmt */
-end-do-stmt:
-        TOK_ENDDO
-      | TOK_ENDDO TOK_NAME
-      ;
-
-/* R832 : if-construct */
-if-construct: if-then-stmt line-break block opt-else-if-stmt-block opt-else-stmt-block end-if-stmt
-      ;
-
-opt-else-if-stmt-block:
-      | else-if-stmt-block
-      | opt-else-if-stmt-block else-if-stmt-block
-      ;
-
-else-if-stmt-block:
-        else-if-stmt line-break block
-      ;
-
-opt-else-stmt-block:
-      | else-stmt-block
-      | opt-else-stmt-block else-if-stmt-block
-      ;
-
-else-stmt-block: else-stmt line-break block
-        ;
-
-/* R833 : if-then-stmt */
-if-then-stmt:
-         TOK_NAME ':' TOK_LOGICALIF '(' expr ')' TOK_THEN
-      |               TOK_LOGICALIF '(' expr ')' TOK_THEN
-      ;
-
-/* R834 : else-if-stmt */
-else-if-stmt:
-        TOK_ELSEIF '(' expr ')' TOK_THEN
-      | TOK_ELSEIF '(' expr ')' TOK_THEN TOK_NAME
-      ;
-
-/* R835 : else-stmt */
-else-stmt:
-        TOK_ELSE
-      | TOK_ELSE TOK_NAME
-      ;
-
-/* R836 : end-if-stmt */
-end-if-stmt:
-        TOK_ENDIF
-      | TOK_ENDIF TOK_NAME
-      ;
-
-/* R837 : if-stmt */
-if-stmt: TOK_LOGICALIF '(' expr ')' action-stmt
-        ;
-
-/* R838 : case-construct */
-case-construct: select-case-stmt line-break opt_case-stmt-block end-select-stmt
-        ;
-
-opt_case-stmt-block:
-        | case-stmt-block
-        | opt_case-stmt-block case-stmt-block
-        ;
-
-case-stmt-block: case-stmt line-break block
-        ;
-
-/* R839 : select-case-stmt */
-select-case-stmt :
-          TOK_NAME ':' TOK_SELECTCASE '(' expr ')'
-        |              TOK_SELECTCASE '(' expr ')'
-        ;
-
-/* R840 : case-stmt */
-case-stmt:
-          TOK_CASE case-selector
-        | TOK_CASE case-selector TOK_NAME
-        ;
-
-/* R840 : end-select-stmt */
-end-select-stmt:
-          TOK_ENDSELECT
-        | TOK_ENDSELECT TOK_NAME
-        ;
-
-/* R843 : case-selector */
-case-selector:
-          '(' case-value-range-list ')'
-        | TOK_DEFAULT
-        ;
-
-case-value-range-list:
-        case-value-range
-      | case-value-range-list ',' case-value-range
-      ;
-
-/* R844: case-value-range */
-case-value-range :
-        case-value
-      | case-value ':'
-      | ':' case-value
-      | case-value ':' case-value
-      ;
-
-/* R845 : case-value */
-case-value: expr
-        ;
-
-/* R854 : continue-stmt */
-continue-stmt: TOK_CONTINUE
-        ;
-
-/* R1001 : format-stmt */
-format-stmt: TOK_FORMAT
-        ;
-
-word_endsubroutine :
-        TOK_ENDSUBROUTINE
-        {
-            strcpy($$,$1);
-            pos_endsubroutine = setposcur()-strlen($1);
-            functiondeclarationisdone = 0;
-        }
-      ;
-word_endunit :
-        TOK_ENDUNIT
-        {
-            strcpy($$,$1);
-            pos_endsubroutine = setposcur()-strlen($1);
-        }
-      ;
-word_endprogram :
-        TOK_ENDPROGRAM
-        {
-            strcpy($$,$1);
-            pos_endsubroutine = setposcur()-strlen($1);
-        }
-      ;
-word_endfunction :
-        TOK_ENDFUNCTION
-        {
-            strcpy($$,$1);
-            pos_endsubroutine = setposcur()-strlen($1);
-        }
-      ;
+        line-break
+     ;
+
+/* R1243 : stmt-function-stmt */
+stmt-function-stmt: TOK_NAME '(' opt-dummy-arg-name-list ')' '=' expr line-break
+     ;
 
 opt_name : '\n'  {strcpy($$,"");}
@@ -1975 +4704 @@
       | callarglist
       ;
-keywordcall :
+keywordcall:
         before_call TOK_FLUSH
       | before_call TOK_NAME
@@ -2000 +4729 @@
       ;
 before_call : TOK_CALL  { pos_curcall=setposcur()-4; }
+      | label TOK_CALL  { pos_curcall=setposcur()-4; }
       ;
 callarglist :
@@ -2021 +4751 @@
       ;
 
-option_inlist :
-      | inlist
-      ;
-option_read :
-        ioctl option_inlist
-      | infmt opt_inlist
-      ;
-opt_inlist :
-      | ',' inlist
-      ;
+option_io_1 :
+        infmt ',' inlist
+      | infmt
+
+option_io_2 :
+        ioctl outlist
+      | ioctl
+
 ioctl : '(' ctllist ')'
       ;
@@ -2058 +4786 @@
       ;
 iofctl :
-        TOK_OPEN
-      | TOK_CLOSE
-      | TOK_FLUSH
+      TOK_FLUSH
       ;
 infmt :  unpar_fexpr
@@ -2066 +4792 @@
       ;
 
-read :  TOK_READ
-      | TOK_INQUIRE
-      | TOK_PRINT
+write_or_inq :
+        TOK_WRITE
       ;