Changeset 1200 for trunk/AGRIF/LIB/convert.y

Timestamp:

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

Author:

rblod

Message:

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

File:

• trunk/AGRIF/LIB/convert.y (modified) (6 diffs)

trunk/AGRIF/LIB/convert.y

@@ -89 +89 @@
    listnom *parcours;
    listvar *newvar;
+   int stylegiven = 0;
+   int infreegiven ;
+   int infixedgiven ;
+   int lengthmainfile;
 
    if (argc < 2)
@@ -95 +99 @@
        printf(" [-comdirin   <directory>] [-comdirout <directory>]\n");
        printf(" [-convfile  <FILENAME >] -SubloopScalar -SubloopScalar1 \n");
+       printf(" [-free|-fixed]\n");
        exit(0);
    }
@@ -122 +127 @@
    tmpuselocallist = (listusemodule *)NULL;
    List_ContainsSubroutine = (listnom *)NULL;
+   oldfortranout = (FILE *)NULL;
 
    strcpy(mainfile,argv[1]);
@@ -185 +191 @@
    value_char_size2 = 0 ;
    value_char_size3 = 0 ;
+   inallocate = 0;
+   infixed = 1;
+   infree  = 0;
 
    checkexistcommon=1;
@@ -235 +244 @@
          strcpy(filetoparse,argv[i+1]);
          i++;
-      }
+         lengthmainfile = strlen(filetoparse);
+         if (!strcasecmp(&filetoparse[lengthmainfile-4],".f90"))
+         {
+         infixed = 0;
+         infree = 1;
+         }
+         else
+         {
+         infixed = 1;
+         infree = 0;
+         }
+      }
+      else if (!strcasecmp(argv[i],"-free")) /* file to parse        */
+      {
+         stylegiven = 1;
+         infreegiven  = 1 ;
+         infixedgiven = 0;
+      }   
+      else if (!strcasecmp(argv[i],"-fixed")) /* file to parse        */
+      {
+         stylegiven = 1;
+         infreegiven  = 0;
+         infixedgiven = 1;
+      }         
       else if (!strcasecmp(argv[i],"-SubloopScalar")) /* file to parse        */
       {
@@ -268 +300 @@
    }
 
+   if (stylegiven == 1) 
+   {
+   infree = infreegiven;
+   infixed = infixedgiven;   
+   }
    Save_Length(nomdir,34);
    Save_Length(commondirout,35);