Merge branch 'master' into Duplicate_module_definitions

Author: kubajj

README.md

@@ -5,20 +5,20 @@ Its key goal is to improve the user experience of Fortran programmers.
 It does so by making it easier to build your Fortran program or library, run the
 executables, tests, and examples, and distribute it as a dependency to other
 Fortran projects.
-Fpm's user interface is modeled after [Rust's Cargo](https://crates.io/),
+Fpm's user interface is modeled after [Rust's Cargo](https://doc.rust-lang.org/cargo/),
 so if you're familiar with that tool, you will feel at home with fpm.
 Fpm's long term vision is to nurture and grow the ecosystem of modern Fortran
 applications and libraries.
 
 Fpm is an early prototype and is evolving rapidly.
 You can use it to build and package your Fortran projects, as well as to use
-existing fpm packages as dependencies.
+[existing fpm packages](https://github.com/fortran-lang/fpm-registry) as dependencies.
 Fpm's behavior and user interface may change as it evolves, however as fpm
 matures and we enter production, we will aim to stay backwards compatible.
 Please follow the [issues](https://github.com/fortran-lang/fpm/issues) to
 contribute and/or stay up to date with the development.
 Before opening a bug report or a feature suggestion, please read our
-[Contributor Guide](CONTRIBUTING.md).
+[Contributor Guide](CONTRIBUTING.md). You can also discuss your ideas and queries with the community in [fpm discussions](https://github.com/fortran-lang/fpm/discussions), or more broadly on [Fortran-Lang Discourse](https://fortran-lang.discourse.group/)
 
 Fortran Package Manager is not to be confused with
 [Jordan Sissel's fpm](https://github.com/jordansissel/fpm), a more general,

fpm/fpm.toml

@@ -1,5 +1,5 @@
 name = "fpm"
-version = "0.1.4"
+version = "0.2.0"
 license = "MIT"
 author = "fpm maintainers"
 maintainer = ""

fpm/src/fpm_command_line.f90

@@ -133,7 +133,7 @@ subroutine get_command_line_settings(cmd_settings)
             case default     ; os_type =  "OS Type:     UNKNOWN"
         end select
         version_text = [character(len=80) :: &
-         &  'Version:     0.1.4, alpha',                           &
+         &  'Version:     0.2.0, alpha',                           &
          &  'Program:     fpm(1)',                                     &
          &  'Description: A Fortran package manager and build system', &
          &  'Home Page:   https://github.com/fortran-lang/fpm',        &

fpm/src/fpm_source_parsing.f90

@@ -33,7 +33,8 @@ module fpm_source_parsing
                               'iso_fortran_env', &
                               'ieee_arithmetic', &
                               'ieee_exceptions', &
-                              'ieee_features  ']
+                              'ieee_features  ', &
+                              'omp_lib        ']
 
 contains
 

fpm/src/fpm_strings.f90

@@ -431,12 +431,13 @@ end subroutine resize_string
 
 !>AUTHOR: John S. Urban
 !!LICENSE: Public Domain
-!!## NAME
-!!    join(3f) - [fpm_strings:EDITING] append CHARACTER variable array into
+!>
+!!##NAME
+!!    join(3f) - [M_strings:EDITING] append CHARACTER variable array into
 !!    a single CHARACTER variable with specified separator
 !!    (LICENSE:PD)
 !!
-!!## SYNOPSIS
+!!##SYNOPSIS
 !!
 !!    pure function join(str,sep,trm,left,right,start,end) result (string)
 !!
@@ -449,13 +450,13 @@ end subroutine resize_string
 !!     character(len=*),intent(in),optional :: end
 !!     character(len=:),allocatable         :: string
 !!
-!!## DESCRIPTION
+!!##DESCRIPTION
 !!   JOIN(3f) appends the elements of a CHARACTER array into a single
 !!   CHARACTER variable, with elements 1 to N joined from left to right.
 !!   By default each element is trimmed of trailing spaces and the
 !!   default separator is a null string.
 !!
-!!## OPTIONS
+!!##OPTIONS
 !!      STR(:)  array of CHARACTER variables to be joined
 !!      SEP     separator string to place between each variable. defaults
 !!              to a null string.
@@ -466,81 +467,75 @@ end subroutine resize_string
 !!      TRM     option to trim each element of STR of trailing
 !!              spaces. Defaults to .TRUE.
 !!
-!!## RESULT
+!!##RESULT
 !!      STRING  CHARACTER variable composed of all of the elements of STR()
 !!              appended together with the optional separator SEP placed
 !!              between the elements.
 !!
-!!## EXAMPLE
+!!##EXAMPLE
 !!
 !!  Sample program:
-!!```fortran
-!!    program demo_join
-!!    use fpm_strings, only: join
-!!    implicit none
-!!    character(len=:),allocatable  :: s(:)
-!!    character(len=:),allocatable  :: out
-!!    integer                       :: i
-!!      s=[character(len=10) :: 'United',' we',' stand,', &
-!!      & ' divided',' we fall.']
-!!      out=join(s)
-!!      write(*,'(a)') out
-!!      write(*,'(a)') join(s,trm=.false.)
-!!      write(*,'(a)') (join(s,trm=.false.,sep='|'),i=1,3)
-!!      write(*,'(a)') join(s,sep='<>')
-!!      write(*,'(a)') join(s,sep=';',left='[',right=']')
-!!      write(*,'(a)') join(s,left='[',right=']')
-!!      write(*,'(a)') join(s,left='>>')
-!!    end program demo_join
-!!```fortran
 !!
-!!  Expected output:
+!!   program demo_join
+!!   use M_strings, only: join
+!!   implicit none
+!!   character(len=:),allocatable  :: s(:)
+!!   character(len=:),allocatable  :: out
+!!   integer                       :: i
+!!     s=[character(len=10) :: 'United',' we',' stand,', &
+!!     & ' divided',' we fall.']
+!!     out=join(s)
+!!     write(*,'(a)') out
+!!     write(*,'(a)') join(s,trm=.false.)
+!!     write(*,'(a)') (join(s,trm=.false.,sep='|'),i=1,3)
+!!     write(*,'(a)') join(s,sep='<>')
+!!     write(*,'(a)') join(s,sep=';',left='[',right=']')
+!!     write(*,'(a)') join(s,left='[',right=']')
+!!     write(*,'(a)') join(s,left='>>')
+!!   end program demo_join
 !!
-!!    United we stand, divided we fall.
-!!    United     we        stand,    divided   we fall.
-!!    United    | we       | stand,   | divided  | we fall.
-!!    United    | we       | stand,   | divided  | we fall.
-!!    United    | we       | stand,   | divided  | we fall.
-!!    United<> we<> stand,<> divided<> we fall.
-!!    [United];[ we];[ stand,];[ divided];[ we fall.]
-!!    [United][ we][ stand,][ divided][ we fall.]
-!!    >>United>> we>> stand,>> divided>> we fall.
+!!  Expected output:
 !!
+!!   United we stand, divided we fall.
+!!   United     we        stand,    divided   we fall.
+!!   United    | we       | stand,   | divided  | we fall.
+!!   United    | we       | stand,   | divided  | we fall.
+!!   United    | we       | stand,   | divided  | we fall.
+!!   United<> we<> stand,<> divided<> we fall.
+!!   [United];[ we];[ stand,];[ divided];[ we fall.]
+!!   [United][ we][ stand,][ divided][ we fall.]
+!!   >>United>> we>> stand,>> divided>> we fall.
 pure function join(str,sep,trm,left,right,start,end) result (string)
 
-! @(#)join(3f): append an array of character variables with specified separator into a single CHARACTER variable
+! @(#)M_strings::join(3f): merge string array into a single CHARACTER value adding specified separators, caps, prefix and suffix
 
 character(len=*),intent(in)          :: str(:)
-character(len=*),intent(in),optional :: sep
-character(len=*),intent(in),optional :: right
-character(len=*),intent(in),optional :: left
-character(len=*),intent(in),optional :: start
-character(len=*),intent(in),optional :: end
+character(len=*),intent(in),optional :: sep, right, left, start, end
 logical,intent(in),optional          :: trm
+character(len=:),allocatable         :: sep_local, left_local, right_local
 character(len=:),allocatable         :: string
-integer                              :: i
 logical                              :: trm_local
-character(len=:),allocatable         :: sep_local
-character(len=:),allocatable         :: left_local
-character(len=:),allocatable         :: right_local
-
-   if(present(sep))then    ;  sep_local=sep      ;  else  ;  sep_local=''      ;  endif
-   if(present(trm))then    ;  trm_local=trm      ;  else  ;  trm_local=.true.  ;  endif
-   if(present(left))then   ;  left_local=left    ;  else  ;  left_local=''     ;  endif
-   if(present(right))then  ;  right_local=right  ;  else  ;  right_local=''    ;  endif
-
+integer                              :: i
+   if(present(sep))then   ; sep_local=sep     ; else ; sep_local=''     ; endif
+   if(present(trm))then   ; trm_local=trm     ; else ; trm_local=.true. ; endif
+   if(present(left))then  ; left_local=left   ; else ; left_local=''    ; endif
+   if(present(right))then ; right_local=right ; else ; right_local=''   ; endif
    string=''
-   do i = 1,size(str)-1
+   if(size(str).eq.0)then
+      string=string//left_local//right_local
+   else
+      do i = 1,size(str)-1
+         if(trm_local)then
+            string=string//left_local//trim(str(i))//right_local//sep_local
+         else
+            string=string//left_local//str(i)//right_local//sep_local
+         endif
+      enddo
       if(trm_local)then
-         string=string//left_local//trim(str(i))//right_local//sep_local
+         string=string//left_local//trim(str(i))//right_local
       else
-         string=string//left_local//str(i)//right_local//sep_local
+         string=string//left_local//str(i)//right_local
       endif
-   enddo
-   if(trm_local)then
-      string=string//left_local//trim(str(i))//right_local
-   else
-      string=string//left_local//str(i)//right_local
    endif
    if(present(start))string=start//string
    if(present(end))string=string//end