[Bug fortran/35019] New: Gfortran does not support "-J <dir>" only "-J<dir>"

[Bug fortran/35019] New: Gfortran does not support "-J <dir>" only "-J<dir>"

[burnus at gcc dot gnu dot org]

Patch (contains also a different patch, I'm to lazy to separate):

The missing argument check is not needed as this is already checked for in
gcc/fortran/gfortranspec.c. OPT_M is not needed as -M is changed into -J.


Index: gcc/fortran/gfortranspec.c
===================================================================
--- gcc/fortran/gfortranspec.c  (revision 131933)
+++ gcc/fortran/gfortranspec.c  (working copy)
@@ -89,6 +89,7 @@
   OPTION_E,                    /* Aka --preprocess.  */
   OPTION_help,                 /* --help.  */
   OPTION_i,                    /* -imacros, -include, -include-*.  */
+  OPTION_J,
   OPTION_l,
   OPTION_L,                    /* Aka --library-directory.  */
   OPTION_nostdlib,             /* Aka --no-standard-libraries, or
@@ -160,6 +161,8 @@
     opt = OPTION_E, skip = 0;
   else if (text[1] == 'i')
     opt = OPTION_i, skip = 0;
+  else if (text[1] == 'J')
+    opt = OPTION_J, skip = (text[2] == '\0'), arg = text + 2;
   else if (text[1] == 'l')
     opt = OPTION_l;
   else if (text[1] == 'L')
@@ -368,6 +371,7 @@
        case OPTION_b:
        case OPTION_B:
        case OPTION_L:
+       case OPTION_J:
        case OPTION_i:
        case OPTION_V:
          /* These options are useful in conjunction with -v to get
@@ -426,7 +430,9 @@
        {
          char *p;

-         if (argv[i][2] == '\0')
+         fprintf (stderr, _("Warning: Using -M mod_path is deprecated, "
+                  "use -J instead\n"));
+         if (argv[i][2] == '\0' && i+1 < argc)
            {
              p = XNEWVEC (char, strlen (argv[i + 1]) + 2);
              p[0] = '-';
@@ -437,12 +443,31 @@
          else
            {
              p = XNEWVEC (char, strlen (argv[i]) + 1);
-             strcpy (p, argv[i]);
+             p[0] = '-';
+             p[1] = 'J';
+             strcpy (&p[2], argv[i]);
            }
          append_arg (p);
          continue;
        }

+      if ((argv[i][0] == '-') && (argv[i][1] == 'J'))
+       {
+         if (argv[i][2] == '\0' && i+1 < argc)
+           {
+             char *p;
+             p = XNEWVEC (char, strlen (argv[i + 1]) + 2);
+             p[0] = '-';
+             p[1] = 'J';
+             strcpy (&p[2], argv[i + 1]);
+             i++;
+             append_arg (p);
+            }
+         else
+           append_arg (argv[i]);
+         continue;
+       }
+
       if ((argv[i][0] == '-') && (argv[i][1] != 'l'))
        {
          /* Not a filename or library.  */
Index: gcc/fortran/options.c
===================================================================
--- gcc/fortran/options.c       (revision 131933)
+++ gcc/fortran/options.c       (working copy)
@@ -389,13 +389,7 @@

   if (gfc_option.module_dir != NULL)
     {
-      gfc_status ("gfortran: Only one -M option allowed\n");
-      exit (3);
-    }
-
-  if (arg == NULL)
-    {
-      gfc_status ("gfortran: Directory required after -M\n");
+      gfc_status ("gfortran: Only one -J option allowed\n");
       exit (3);
     }

@@ -717,7 +711,6 @@
       break;

     case OPT_J:
-    case OPT_M:
       gfc_handle_module_path_options (arg);
       break;


-- 
           Summary: Gfortran does not support "-J <dir>" only "-J<dir>"
           Product: gcc
           Version: 4.3.0
            Status: UNCONFIRMED
          Severity: normal
          Priority: P3
         Component: fortran
        AssignedTo: unassigned at gcc dot gnu dot org
        ReportedBy: burnus at gcc dot gnu dot org


http://gcc.gnu.org/bugzilla/show_bug.cgi?id=35019

[Bug fortran/35019] Gfortran does not support "-J <dir>" only "-J<dir>"

[fxcoudert at gcc dot gnu dot org]

-- 

fxcoudert at gcc dot gnu dot org changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|UNCONFIRMED                 |NEW
     Ever Confirmed|0                           |1
   Last reconfirmed|0000-00-00 00:00:00         |2008-02-04 17:35:33
               date|                            |


http://gcc.gnu.org/bugzilla/show_bug.cgi?id=35019

[Bug fortran/35019] Gfortran does not support "-J <dir>" only "-J<dir>"

[dfranke at gcc dot gnu dot org]

------- Comment #1 from dfranke at gcc dot gnu dot org  2008-02-06 21:49 -------
Untested, just happened to read the manual cited below.

Index: lang.opt
===================================================================
--- lang.opt    (revision 132097)
+++ lang.opt    (working copy)
@@ -25,13 +25,25 @@ Language
 Fortran

 I
-Fortran Joined
+Fortran Joined Separate
 -I<directory>  Add a directory for INCLUDE and MODULE searching

http://gcc.gnu.org/onlinedocs/gccint/Option-properties.html#Option-properties


-- 

dfranke at gcc dot gnu dot org changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |dfranke at gcc dot gnu dot
                   |                            |org


http://gcc.gnu.org/bugzilla/show_bug.cgi?id=35019

[Bug fortran/35019] Gfortran does not support "-J <dir>" only "-J<dir>"

[dfranke at gcc dot gnu dot org]

------- Comment #2 from dfranke at gcc dot gnu dot org  2008-02-10 14:00 -------
Patch: http://gcc.gnu.org/ml/fortran/2008-02/msg00079.html


-- 

dfranke at gcc dot gnu dot org changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
         AssignedTo|unassigned at gcc dot gnu   |dfranke at gcc dot gnu dot
                   |dot org                     |org
             Status|NEW                         |ASSIGNED
           Keywords|                            |patch
   Last reconfirmed|2008-02-04 17:35:33         |2008-02-10 14:00:51
               date|                            |


http://gcc.gnu.org/bugzilla/show_bug.cgi?id=35019

[Bug fortran/35019] Gfortran does not support "-J <dir>" only "-J<dir>"

[dfranke at gcc dot gnu dot org]

------- Comment #3 from dfranke at gcc dot gnu dot org  2008-02-10 15:13 -------
Fixed in trunk. Closing.


-- 

dfranke at gcc dot gnu dot org changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|ASSIGNED                    |RESOLVED
         Resolution|                            |FIXED
   Target Milestone|---                         |4.3.0


http://gcc.gnu.org/bugzilla/show_bug.cgi?id=35019

[Bug fortran/35019] Gfortran does not support "-J <dir>" only "-J<dir>"

[burnus at gcc dot gnu dot org]

------- Comment #4 from burnus at gcc dot gnu dot org  2008-03-26 21:34 -------
This does not seem to work.

While "-M ." indeed passes "." to gfc_handle_module_path_options,
      "-M."  becomes the option "-M." which is not recognized.
On the other hand: "-J." is passed as "." while "-J ." passes
"-fintrinsic-modules-path" which is wrong.


-- 

burnus at gcc dot gnu dot org changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|RESOLVED                    |REOPENED
         Resolution|FIXED                       |


http://gcc.gnu.org/bugzilla/show_bug.cgi?id=35019

[Bug fortran/35019] Gfortran does not support "-J <dir>" only "-J<dir>"

[dfranke at gcc dot gnu dot org]

------- Comment #5 from dfranke at gcc dot gnu dot org  2008-03-27 21:55 -------
Confirmed :(

Just found: the same holds true for -fintrinsic-modules-path which is supposed
to accept separated arguments as well. For both, -J and
-fintrinsic-modules-path, a separated argument is stripped away and treated as
input file. However, the same does NOT hold for -I which is defined the same
way as the other two (Fortran Joined Separate) in lang.opt?!

I'm investigating.


-- 

dfranke at gcc dot gnu dot org changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
           Keywords|patch                       |


http://gcc.gnu.org/bugzilla/show_bug.cgi?id=35019

[Bug fortran/35019] Gfortran does not support "-J <dir>" only "-J<dir>"

[dfranke at gcc dot gnu dot org]

------- Comment #6 from dfranke at gcc dot gnu dot org  2008-03-28 00:40 -------
This patch seems to finally fix the problem - but if this is the Right Way
(TM)? 

The changes in gfortranspec.c are necessary to trigger a missing-argument
message on:

$> gfortran-svn foo.f90 -J
gfortran-svn: argument to '-J' missing


Index: ../gcc.h
===================================================================
--- ../gcc.h    (revision 133396)
+++ ../gcc.h    (working copy)
@@ -35,9 +35,9 @@ struct spec_function
 #define DEFAULT_SWITCH_TAKES_ARG(CHAR) \
   ((CHAR) == 'D' || (CHAR) == 'U' || (CHAR) == 'o' \
    || (CHAR) == 'e' || (CHAR) == 'T' || (CHAR) == 'u' \
-   || (CHAR) == 'I' || (CHAR) == 'm' || (CHAR) == 'x' \
-   || (CHAR) == 'L' || (CHAR) == 'A' || (CHAR) == 'V' \
-   || (CHAR) == 'B' || (CHAR) == 'b')
+   || (CHAR) == 'I' || (CHAR) == 'J' || (CHAR) == 'm' \
+   || (CHAR) == 'x' || (CHAR) == 'L' || (CHAR) == 'A' \
+   || (CHAR) == 'V' || (CHAR) == 'B' || (CHAR) == 'b')

 /* This defines which multi-letter switches take arguments.  */

@@ -50,7 +50,8 @@ struct spec_function
   || !strcmp (STR, "iquote") || !strcmp (STR, "isystem") \
   || !strcmp (STR, "isysroot") \
   || !strcmp (STR, "-param") || !strcmp (STR, "specs") \
-  || !strcmp (STR, "MF") || !strcmp (STR, "MT") || !strcmp (STR, "MQ"))
+  || !strcmp (STR, "MF") || !strcmp (STR, "MT") || !strcmp (STR, "MQ") \
+  || !strcmp(STR, "fintrinsic-modules-path"))


 /* These are exported by gcc.c.  */
Index: gfortranspec.c
===================================================================
--- gfortranspec.c      (revision 133396)
+++ gfortranspec.c      (working copy)
@@ -175,6 +175,8 @@ lookup_option (Option *xopt, int *xskip,
     opt = OPTION_v, skip = 0;
   else if (text[1] == 'x')
     opt = OPTION_x, arg = text + 2;
+  else if (text[1] == 'J')
+    ;
   else
     {
       if ((skip = WORD_SWITCH_TAKES_ARG (text + 1)) != 0)  /* See gcc.c.  */


Not bootstrapped/regtested yet.


-- 


http://gcc.gnu.org/bugzilla/show_bug.cgi?id=35019

[Bug fortran/35019] Gfortran does not support "-J <dir>" only "-J<dir>"

[pinskia at gcc dot gnu dot org]

-- 

pinskia at gcc dot gnu dot org changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
   Target Milestone|4.3.0                       |---


http://gcc.gnu.org/bugzilla/show_bug.cgi?id=35019

[Bug fortran/35019] Gfortran does not support "-J <dir>" only "-J<dir>"

[dfranke at gcc dot gnu dot org]

------- Comment #7 from dfranke at gcc dot gnu dot org  2008-04-21 17:11 -------
Subject: Bug 35019

Author: dfranke
Date: Mon Apr 21 17:10:15 2008
New Revision: 134518

URL: http://gcc.gnu.org/viewcvs?root=gcc&view=rev&rev=134518
Log:
gcc:
2008-04-21  Daniel Franke  <franke.daniel@gmail.com>

        PR fortran/35019
        * gcc.h: Added fortran options that take arguments to
        DEFAULT_SWITCH_TAKES_ARG and DEFAULT_WORD_SWITCH_TAKES_ARG
        macros.

gcc/fortran:
2008-04-21  Daniel Franke  <franke.daniel@gmail.com>

        PR fortran/35019
        * gfortranspec.c (lookup_option): Properly handle separated arguments
        in -J option, print missing argument message when necessary.


Modified:
    trunk/gcc/ChangeLog
    trunk/gcc/fortran/ChangeLog
    trunk/gcc/fortran/gfortranspec.c
    trunk/gcc/gcc.h


-- 


http://gcc.gnu.org/bugzilla/show_bug.cgi?id=35019

[Bug fortran/35019] Gfortran does not support "-J <dir>" only "-J<dir>"

[dfranke at gcc dot gnu dot org]

------- Comment #8 from dfranke at gcc dot gnu dot org  2008-04-21 17:11 -------
Fixed on trunk. Closing.
Again.


-- 

dfranke at gcc dot gnu dot org changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
   Target Milestone|---                         |4.4.0


http://gcc.gnu.org/bugzilla/show_bug.cgi?id=35019

[Bug fortran/35019] Gfortran does not support "-J <dir>" only "-J<dir>"

[dfranke at gcc dot gnu dot org]

------- Comment #9 from dfranke at gcc dot gnu dot org  2008-04-21 17:12 -------
See comment #8.


-- 

dfranke at gcc dot gnu dot org changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|REOPENED                    |RESOLVED
         Resolution|                            |FIXED


http://gcc.gnu.org/bugzilla/show_bug.cgi?id=35019