Removed explicit Kind term within an IntrinsicType

Author: Craig Rasmussen

fortran/pp/Fortran.pp

@@ -82,20 +82,20 @@
    %% R404
    Type                          -- H hs=1[_1 _2],
    INTEGER                       -- "INTEGER",
-   INTEGER                       -- "INTEGER" _1,
+   INTEGER                       -- "INTEGER" "(" "KIND=" _1 ")",
    REAL                          -- "REAL",
-   REAL                          -- "REAL" _1,
+   REAL                          -- "REAL"    "(" "KIND=" _1 ")",
    DOUBLEPRECISION               -- "DOUBLE PRECISION",
    LOGICAL                       -- "LOGICAL",
-   LOGICAL                       -- "LOGICAL" _1,
+   LOGICAL                       -- "LOGICAL" "(" "KIND=" _1 ")",
    COMPLEX                       -- "COMPLEX",
-   COMPLEX                       -- "COMPLEX" _1,
+   COMPLEX                       -- "COMPLEX" "(" "KIND=" _1 ")",
    DOUBLECOMPLEX                 -- "DOUBLE COMPLEX",
 
    CHARACTER                     -- "CHARACTER",
    CHARACTER                     -- "CHARACTER" "(" _1 ")",
    CHARACTER                     -- "CHARACTER" "(" _1 ",KIND=" _2 ")",
-   ppCharNoLen                   -- "CHARACTER" "(" "KIND=" _1 ")",
+   ppCharNoLen                   -- "CHARACTER" "("     "KIND=" _1 ")",
 
    %% R406
    SignedIntLiteralConstant      -- _1 _2,

fortran/trans/ofp2fast.str

@@ -262,12 +262,19 @@ ofp-to-ast =  ?IncludeStmt(file,eos("\n"))      ; !IncludeStmt(file)
           <+  ?IncludeStmt(file,eos(str))       ; !IncludeStmt(file) {Comment(str)}
 
 //R404
-ofp-to-ast:  IntrinsicType(type)                -> type
+ofp-to-ast:  IntrinsicType(type)                -> <remove-kind-from-intrinsic-type> type
 
 ofp-to-ast =
       ? CHARACTER(CharSelector(len,no-kind()))  ; ! CHARACTER(len)
    <+ ? CHARACTER(CharSelector(len,kind))       ; ! CHARACTER(len,kind)
 
+remove-kind-from-intrinsic-type =
+      ? INTEGER(Kind(kind))                     ; ! INTEGER(kind)
+   <+ ?    REAL(Kind(kind))                     ; !    REAL(kind)
+   <+ ? COMPLEX(Kind(kind))                     ; ! COMPLEX(kind)
+   <+ ? LOGICAL(Kind(kind))                     ; ! LOGICAL(kind)
+   <+ id /* default is to leave as is */
+
 //R420
 ofp-to-ast: CharSelector_KIND_LEN(kind,len)     -> CharSelector(len,kind)