check name used for package, executable, test, or example

Author: urbanjost

src/fpm.f90

@@ -256,19 +256,19 @@ subroutine cmd_build(settings)
 call get_package_data(package, "fpm.toml", error, apply_defaults=.true.)
 if (allocated(error)) then
     print '(a)', error%message
-    error stop 1
+    stop 1
 end if
 
 call build_model(model, settings, package, error)
 if (allocated(error)) then
     print '(a)', error%message
-    error stop 1
+    stop 1
 end if
 
 call targets_from_sources(targets,model,error)
 if (allocated(error)) then
     print '(a)', error%message
-    error stop 1
+    stop 1
 end if
 
 if(settings%list)then
@@ -305,19 +305,19 @@ subroutine cmd_run(settings,test)
     call get_package_data(package, "fpm.toml", error, apply_defaults=.true.)
     if (allocated(error)) then
         print '(a)', error%message
-        error stop 1
+        stop 1
     end if
 
     call build_model(model, settings%fpm_build_settings, package, error)
     if (allocated(error)) then
         print '(a)', error%message
-        error stop 1
+        stop 1
     end if
 
     call targets_from_sources(targets,model,error)
     if (allocated(error)) then
         print '(a)', error%message
-        error stop 1
+        stop 1
     end if
 
     if (test) then

src/fpm/cmd/install.f90

@@ -169,7 +169,7 @@ subroutine handle_error(error)
     type(error_t), intent(in), optional :: error
     if (present(error)) then
       print '("[Error]", 1x, a)', error%message
-      error stop 1
+      stop 1
     end if
   end subroutine handle_error
 

src/fpm/cmd/new.f90

@@ -55,9 +55,9 @@ module fpm_cmd_new
 
 use fpm_command_line, only : fpm_new_settings
 use fpm_environment, only : run, OS_LINUX, OS_MACOS, OS_WINDOWS
-use fpm_filesystem, only : join_path, exists, basename, mkdir, is_dir, to_fortran_name
+use fpm_filesystem, only : join_path, exists, basename, mkdir, is_dir
 use fpm_filesystem, only : fileopen, fileclose, filewrite, warnwrite
-use fpm_strings, only : join
+use fpm_strings, only : join, to_fortran_name
 use,intrinsic :: iso_fortran_env, only : stderr=>error_unit
 implicit none
 private

src/fpm/cmd/update.f90

@@ -61,7 +61,7 @@ subroutine handle_error(error)
     type(error_t), intent(in), optional :: error
     if (present(error)) then
       print '(a)', error%message
-      error stop 1
+      stop 1
     end if
   end subroutine handle_error
 

src/fpm/error.f90

@@ -16,16 +16,8 @@ module fpm_error
 
     end type error_t
 
-
-    !> Alias syntax errors to fatal errors for now
-    interface syntax_error
-        module procedure :: fatal_error
-    end interface syntax_error
-
-
 contains
 
-
     !> Generic fatal runtime error
     subroutine fatal_error(error, message)
 
@@ -40,6 +32,19 @@ subroutine fatal_error(error, message)
 
     end subroutine fatal_error
 
+    subroutine syntax_error(error, message)
+
+        !> Instance of the error data
+        type(error_t), allocatable, intent(out) :: error
+
+        !> Error message
+        character(len=*), intent(in) :: message
+
+        allocate(error)
+        error%message = message
+
+    end subroutine syntax_error
+
 
     !> Error created when a file is missing or not found
     subroutine file_not_found_error(error, file_name)

src/fpm/manifest/example.f90

@@ -19,6 +19,7 @@ module fpm_manifest_example
     use fpm_manifest_executable, only : executable_config_t
     use fpm_error, only : error_t, syntax_error
     use fpm_toml, only : toml_table, toml_key, toml_stat, get_value
+    use fpm_strings, only : to_fortran_name, is_fortran_name
     implicit none
     private
 
@@ -61,6 +62,11 @@ subroutine new_example(self, table, error)
            call syntax_error(error, "Could not retrieve example name")
            return
         end if
+        if(.not.is_fortran_name(to_fortran_name(self%name)))then
+           call syntax_error(error, 'manifest file syntax error: example name must be composed only of &
+           &alphanumerics, "-" and "_"  and start with a letter')
+           return
+        endif
         call get_value(table, "source-dir", self%source_dir, "example")
         call get_value(table, "main", self%main, "main.f90")
 

src/fpm/manifest/executable.f90

@@ -13,7 +13,7 @@
 module fpm_manifest_executable
     use fpm_manifest_dependency, only : dependency_config_t, new_dependencies
     use fpm_error, only : error_t, syntax_error
-    use fpm_strings, only : string_t
+    use fpm_strings, only : string_t, is_fortran_name, to_fortran_name
     use fpm_toml, only : toml_table, toml_key, toml_stat, get_value
     implicit none
     private
@@ -72,6 +72,11 @@ subroutine new_executable(self, table, error)
            call syntax_error(error, "Could not retrieve executable name")
            return
         end if
+        if(.not.is_fortran_name(to_fortran_name(self%name)))then
+           call syntax_error(error, 'manifest file syntax error: executable name must be composed only of &
+           &alphanumerics, "-" and "_"  and start with a letter')
+           return
+        endif
         call get_value(table, "source-dir", self%source_dir, "app")
         call get_value(table, "main", self%main, "main.f90")
 

src/fpm/manifest/package.f90

@@ -42,6 +42,7 @@ module fpm_manifest_package
     use fpm_error, only : error_t, fatal_error, syntax_error
     use fpm_toml, only : toml_table, toml_array, toml_key, toml_stat, get_value, &
         & len
+    use fpm_strings, only : is_fortran_name, to_fortran_name
     use fpm_versioning, only : version_t, new_version
     implicit none
     private
@@ -131,6 +132,11 @@ subroutine new_package(self, table, root, error)
            call syntax_error(error, "Could not retrieve package name")
            return
         end if
+        if(.not.is_fortran_name(to_fortran_name(self%name)))then
+           call syntax_error(error, 'manifest file syntax error: package name must be composed only of &
+           &alphanumerics, "-" and "_"  and start with a letter')
+           return
+        endif
 
         if (len(self%name) <= 0) then
             call syntax_error(error, "Package name must be a non-empty string")

src/fpm/manifest/test.f90

@@ -19,6 +19,7 @@ module fpm_manifest_test
     use fpm_manifest_executable, only : executable_config_t
     use fpm_error, only : error_t, syntax_error
     use fpm_toml, only : toml_table, toml_key, toml_stat, get_value
+    use fpm_strings, only : to_fortran_name, is_fortran_name
     implicit none
     private
 
@@ -61,6 +62,11 @@ subroutine new_test(self, table, error)
            call syntax_error(error, "Could not retrieve test name")
            return
         end if
+        if(.not.is_fortran_name(to_fortran_name(self%name)))then
+           call syntax_error(error, 'manifest file syntax error: test name must be composed only of &
+           &alphanumerics, "-" and "_"  and start with a letter')
+           return
+        endif
         call get_value(table, "source-dir", self%source_dir, "test")
         call get_value(table, "main", self%main, "main.f90")
 

src/fpm_command_line.f90

@@ -28,8 +28,8 @@ module fpm_command_line
                              OS_CYGWIN, OS_SOLARIS, OS_FREEBSD, OS_OPENBSD
 use M_CLI2,           only : set_args, lget, sget, unnamed, remaining, specified
 use M_CLI2,           only : get_subcommand, CLI_RESPONSE_FILE
-use fpm_strings,      only : lower, split, fnv_1a
-use fpm_filesystem,   only : basename, canon_path, to_fortran_name, which
+use fpm_strings,      only : lower, split, fnv_1a, to_fortran_name, is_fortran_name
+use fpm_filesystem,   only : basename, canon_path, which
 use fpm_environment,  only : run, get_command_arguments_quoted
 use fpm_compiler, only : get_default_compile_flags
 use,intrinsic :: iso_fortran_env, only : stdin=>input_unit, &
@@ -517,27 +517,6 @@ end subroutine printhelp
 
     end subroutine get_command_line_settings
 
-    function is_fortran_name(line) result (lout)
-    ! determine if a string is a valid Fortran name ignoring trailing spaces
-    ! (but not leading spaces)
-    character(len=*),parameter   :: int='0123456789'
-    character(len=*),parameter   :: lower='abcdefghijklmnopqrstuvwxyz'
-    character(len=*),parameter   :: upper='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-    character(len=*),parameter   :: allowed=upper//lower//int//'_'
-    character(len=*),intent(in)  :: line
-    character(len=:),allocatable :: name
-    logical                      :: lout
-        name=trim(line)
-        if(len(name).ne.0)then
-            lout = .true.                                  &
-             & .and. verify(name(1:1), lower//upper) == 0  &
-             & .and. verify(name,allowed) == 0             &
-             & .and. len(name) <= 63
-        else
-            lout = .false.
-        endif
-    end function is_fortran_name
-
     subroutine set_help()
    help_list_nodash=[character(len=80) :: &
    'USAGE: fpm [ SUBCOMMAND [SUBCOMMAND_OPTIONS] ]|[--list|--help|--version]', &