init

Author: scivision

CMakeLists.txt

@@ -90,6 +90,12 @@ if(NOT WIN32) # FIXME doable via windows command
   add_test(NAME FortranTerminalIO COMMAND bash -c "./termio <<< 0")
 endif()
 
+add_executable(special_char special_characters.f90)
+target_compile_options(special_char PRIVATE ${FFLAGS})
+
+add_executable(expanduser expanduser.f90)
+target_compile_options(expanduser PRIVATE ${FFLAGS})
+
 add_executable(precprob precision_problems.f90)
 target_compile_options(precprob PRIVATE ${FFLAGS})
 add_test(NAME FortranPrecision COMMAND precprob)

expanduser.f90

@@ -1,24 +1,35 @@
-module ioutils
+module fsutils
 implicit none
 contains
 
-subroutine expanduser(expandhome, indir)
+function expanduser(indir)
 
-character(*), intent(in), optional :: indir
-character(:), allocatable, intent(out) :: expandhome
+character(:), allocatable :: expanduser
+character(*), intent(in) :: indir
 
-character :: filesep
-character(256) :: buf
 ! -- resolve home directory as Fortran does not understand tilde
 ! works for Linux, Mac, Windows and more
 
-if (present(indir)) then
-  if (indir(1:1) /= '~') then
-    expandhome = indir
-    return
-  endif
+if (len(indir) < 1) then
+  stop 'must provide path to expand'
+elseif (indir(1:1) /= '~') then
+  expanduser = indir
+  return
+elseif (len(indir) < 3) then
+  expanduser = homedir()
+else
+  expanduser = homedir() // indir(3:)
 endif
 
+end function expanduser
+
+
+function homedir()
+
+character(:), allocatable :: homedir
+character :: filesep
+character(256) :: buf
+
 ! assume MacOS/Linux/BSD/Cygwin/WSL
 filesep = '/'
 call get_environment_variable("HOME", buf)
@@ -28,34 +39,29 @@ subroutine expanduser(expandhome, indir)
   filesep = char(92)
 endif
 
-expandhome = trim(buf) // filesep // indir(3:)
+homedir = trim(buf) // filesep
 
+end function homedir
 
-end subroutine expanduser
 
-end module ioutils
+end module fsutils
 
 !------ demo
 
 program home
 
-use ioutils
+use fsutils
 implicit none
 ! explores what '~' means for paths in Fortran
 ! Note: when testing, enclose argument in '~/test.txt' quotes or 
 !  shell will expand '~' before it gets to Fortran!
 
-integer :: fid, ios
 character(:), allocatable :: expanded
 character(256) :: buf
 
-call get_command_argument(1, buf, status=ios)
+call get_command_argument(1, buf)
 
-if (ios==0) then
-  call expanduser(expanded, trim(buf))
-else
-  call expanduser(expanded)
-endif
+expanded = expanduser(trim(buf))
 
 print '(A)', trim(buf)
 print '(A)', expanded