Changeset 13027 for vendors/AGRIF/dev_r12970_AGRIF_CMEMS/LEX/convert.y

Timestamp:

2020-06-03T16:36:09+02:00 (4 years ago)

Author:

rblod

Message:

New AGRIF library, see ticket #2129

File:

• vendors/AGRIF/dev_r12970_AGRIF_CMEMS/LEX/convert.y (modified) (4 diffs)

vendors/AGRIF/dev_r12970_AGRIF_CMEMS/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);