Pm0 5

README.md

@@ -1,94 +1,7 @@
 ![ PM logo ](/PM-LOGO.png)
-# PM Programming Language 
+# PM Programming Language -- version 0.5 development
 ## [www.pm-lang.org](http://www.pm-lang.org)
 
-## Overview
+This branch supports ongoing development of PM version 0.5
 
-The PM Programming Language is designed to facilitate the creation
-of numerical models on parallel systems. It combines concepts of
-parallelisation and vectorisation into a unified model using a 'strand'
-as a basic unit of parallelisation. A strand is a very lightweight
-entity that does not require its own stack and can map to a single execution 
-of a loop body. Strands are used in both data and task parallelism and can communicate
-with other strands, including those running on other nodes. PM uses a modified form of
-the Partitioned Global Address Space approach which builds synchronisation into basic operations 
-and excludes race conditions.
 
-The PM compiler currently cross-compiles to Fortran+MPI. More target language/library
-combinations are planned, including Fortran-MPI-OpenMP and accelerator support (initially
-via either OpenMP or OpenACC)
-
-The PM interpreter uses a parallel virtual machine and is designed for debugging PM code.
-
-The language specification (available in /doc) while incomplete in places, will give
-a good view of the features of the version 0.4 of the language.
-
-## Status
-
-This is a pre-release version of the PM language. While syntax and semantics are now well
-developed, there may be further changes to both in response to feedback.
-
-The implementation is not yet fully free of bugs or unimplemented features. If you encounter
-a problem, then please check the latest code on GitHub. If this does not work, then please
-raise an issue.
-
-## Contribution
-
-This is an open source project and outside contributions are entirely welcome.
-
-At this stage the most effective contributions are in the are of testing and
-feedback on the language design and implementation.
-
-A refactoring of compiler/interpreter source code is underway for version 0.5. 
-One goal of this will be to make the code more accessible to outside contributors.
-In the meantime, bug-fix contributions to the source code by the brave are certainly welcome.
-
-
-## Installation and use
-
-This is an initial release of version 0.4 of the language. At the moment
-the code is designed to be compiled and installed on a Linux system with
-MPI. It should be possible to compile on other systems with MPI and Fortan.
-
-To compile PM:
-
-Make sure you have MPI installed and loaded and can run mpifort and mpirun
-
-The current setup is developed on Fedora with gfortran and openmp. You
-can edit pm/Makefile and pmc/Makefile to change compilers.
-
-The code should be fairly portable. Portability issues may be addressed by
-editing config/sysdep.f90 (read the comments)
-
-To compile the interpreter:
-
-  cd pm
-
-  make clean
-
-  make
-
-You can then run the interpreter (./pm --help for options)
-
-mpirun the interpreter for distributed execution.
-
-To compile PM-to-Fortran compiler:
-
-  cd pmc
-
-  make clean
-
-  make
-
-To compile a PM program to Fortran use ./pmc (./pmc --help for options)
-
-The pmc compiler does not use MPI.
-
-The compiled code will appear as PMOUT.F90 and will need to be compiled using mpifort. 
-
-You can then mpirun the resulting executable.
-
-Both compiler and interpreter expect PM source files to have a .pmm extension.
-
-
-## Watch out for continuing updates.

config/sysdep.f90

@@ -3,7 +3,7 @@
 !
 ! Released under the MIT License (MIT)
 !
-! Copyright (c) Tim Bellerby, 2019
+! Copyright (c) Tim Bellerby, 2024
 !
 ! Permission is hereby granted, free of charge, to any person obtaining a copy
 ! of this software and associated documentation files (the "Software"), to deal
@@ -35,11 +35,14 @@ module pm_sysdep
   ! ********* Error messages ****************
   ! Error messages in colour
   logical:: pm_colour_messages=.true.
+  logical:: pm_bright_messages=.true.
+  logical:: pm_bold_messages=.true.
+  character(len=*),parameter:: pm_error_start_bright=achar(27)//'[91;1m'
   character(len=*),parameter:: pm_error_start=achar(27)//'[31;1m'
   character(len=*),parameter:: pm_error_end=achar(27)//'[39;22m'
   character(len=*),parameter:: pm_loc_start=achar(27)//'[1m'
   character(len=*),parameter:: pm_loc_end=achar(27)//'[22m'
-  
+
   ! ********* File settings *****************
   ! Standard output
   integer,parameter:: pm_stdout_unit=6
@@ -50,22 +53,30 @@ module pm_sysdep
   ! Suffix for input files
   character(len=4),parameter:: pm_file_suffix='.pmm'
 
-  ! Prefix for library files
-  character(len=15),parameter:: pm_file_prefix='/usr/lib/pm/lib'
+  ! Environment variable holding location of library files
+  character(len=12),parameter:: pm_env_var='PM_LANG_LIBS'
 
   ! Directory separator (one character only)
   character(len=1),parameter:: pm_file_dirsep='/' 
+
+  ! Path separator (one character only)
+  character(len=1),parameter:: pm_lib_path_sep=':' 
 
   ! Maximum size of file name
   integer,parameter:: pm_max_filename_size=4096
 
   ! Character value used to signal end of file
   character(len=1),parameter:: pm_eof_char=achar(0)
 
+  ! Default library path
+  character(len=22):: pm_default_lib_path='/usr/share/pm-lang/lib'
+  logical:: pm_default_lib_path_set=.true.
 
   ! ************ Compiler defaults ****************
   integer,parameter:: pm_default_ftn_dims=15
   logical,parameter:: pm_default_ftn_has_contiguous=.true.
+  integer,parameter:: pm_default_ftn_lines=255
+  integer,parameter:: pm_default_ftn_max_stack_array=10*1024*1024
 
 
   ! ************ Memory model *********************
@@ -80,13 +91,14 @@ module pm_sysdep
 
   ! Types used by memory model (block offsets,object sizes,bitmap flags)
 
- ! integer,parameter:: pm_p=kind(1)    ! Pointer offsets, object types +
-                                       ! flags  (>~24 bits, typically int)
-integer,parameter:: pm_p=8
+  ! integer,parameter:: pm_p=kind(1)    ! Pointer offsets, object types +
+                                        ! flags  (>~24 bits, typically int)
+
+  integer,parameter:: pm_p=8
 
-  integer,parameter:: pm_f=kind(1)    ! Bitmap storage  (integer word)
-                                      ! On some systems int64 may
-                                      ! improve things slightly
+  integer,parameter:: pm_f=kind(1)      ! Bitmap storage  (integer word)
+                                        ! On some systems int64 may
+                                        ! improve things slightly
 
   ! ********* Vector Virtual Machine ********
 
@@ -166,20 +178,50 @@ module pm_sysdep
 
   ! Long long integers - big enough to address any file
   integer,parameter:: pm_lln=MPI_OFFSET_KIND
-
+
+  ! Maximum arguments to a PM procedure (must be 2**m-1 for some m)
+  integer,parameter:: pm_max_args=31
+  character(len=3),parameter:: pm_maxargs_str=' 31'
+
 
 contains
 
-  function pm_argc() result(n)
-    integer:: n
-    n=iargc()
-  end function pm_argc
+   function pm_argc() result(n)
+     integer:: n
+     n=command_argument_count()
+   end function pm_argc
+
+   subroutine pm_getarg(n,str)
+     integer,intent(in)::n
+     character(len=*):: str
+     call get_command_argument(n,str)
+   end subroutine pm_getarg
+
+  subroutine pm_get_env_var(varname,str,ok)
+    character(len=*):: varname,str
+    logical:: ok
+    integer:: status
+    call get_environment_variable(varname,str,status=status)
+    ok=status==0
+  end subroutine pm_get_env_var
 
-  subroutine pm_getarg(n,str)
-    integer,intent(in)::n
-    character(len=*):: str
-    call getarg(n,str)
-  end subroutine pm_getarg
+!!$  function pm_argc() result(n)
+!!$    integer:: n
+!!$    n=iargc()
+!!$  end function pm_argc
+!!$
+!!$  subroutine pm_getarg(n,str)
+!!$    integer,intent(in)::n
+!!$    character(len=*):: str
+!!$    call getarg(n,str)
+!!$  end subroutine pm_getarg
+
+!!$   subroutine pm_get_env_var(varname,str,ok)
+!!$    character(len=*):: varname,str
+!!$    logical:: ok
+!!$    call getenv(varname,str)
+!!$    ok=str/=' '
+!!$  end subroutine pm_get_env_var
 
   function pm_isatty(l) result(ok)
     integer,intent(in)::l
@@ -194,25 +236,66 @@ end function pm_isatty
  !   ok=pm_colour_messages
  ! end function pm_isatty
 
-  subroutine pm_module_filename(inbuffer,buffer)
-   character(len=*):: inbuffer,buffer
-   integer:: n,m
-   buffer=inbuffer
-   n=len_trim(buffer)
-   if(n>len(pm_file_suffix)) then
-     if(buffer(n-len(pm_file_suffix)+1:n)==pm_file_suffix) return
-   endif
-   if(buffer(1:4)=='lib.') then
-      m=len(pm_file_prefix)
-      buffer(m+1:m+n)=buffer(1:n)
-      buffer(1:m)=pm_file_prefix
-   endif
-   do m=1,n
-      if(buffer(m:m)=='.') then
-         buffer(m:m)=pm_file_dirsep
-      endif
-   enddo
-   buffer(n+1:n+len(pm_file_suffix))=pm_file_suffix
- end subroutine pm_module_filename
+  subroutine pm_module_filename(inbuffer,buffer,lib_path_set,lib_path)
+    character(len=*),intent(in):: inbuffer,lib_path
+    character(len=*),intent(out):: buffer
+    logical,intent(in):: lib_path_set
+    integer:: n,m,i,tot,pathlen
+    logical:: ok
+    n=len_trim(inbuffer)
+    if(n>len(pm_file_suffix)) then
+       if(inbuffer(n-len(pm_file_suffix)+1:n)==pm_file_suffix) then
+          buffer=inbuffer
+          return
+       endif
+    endif
+    if(inbuffer(1:4)=='lib.'.and.lib_path_set) then
+       i=1
+       do
+          m=index(lib_path(i:),pm_lib_path_sep)
+!!$          write(*,*) 'm=',m,trim(lib_path(i:m-1))
+          if(m==0) then
+             m=len_trim(lib_path)
+          else
+             m=m+i-2
+          endif
+          if(m>=i) then
+             pathlen=m-i+1
+             tot=pathlen+n-3
+             if(tot+len_trim(pm_file_suffix)>len(buffer)) then
+                if(m+2>len(lib_path)) exit
+                i=m+2
+                cycle
+             endif
+             buffer(1:pathlen)=lib_path(i:m)
+             do i=4,n
+                if(inbuffer(i:i)=='.') then
+                   buffer(i+pathlen-3:i+pathlen-3)=pm_file_dirsep
+                else
+                   buffer(i+pathlen-3:i+pathlen-3)=inbuffer(i:i)
+                endif
+             enddo
+             buffer(tot+1:)=pm_file_suffix
+!!$             write(*,*) 'TRY:',trim(buffer)
+             inquire(file=trim(buffer),exist=ok)
+             if(ok) return
+          else
+             exit
+          endif
+          if(m+2>len(lib_path)) exit
+          i=m+2
+       end do
+    endif
+    do m=1,n
+       if(inbuffer(m:m)=='.') then
+          buffer(m:m)=pm_file_dirsep
+       else
+          buffer(m:m)=inbuffer(m:m)
+       endif
+    end do
+    if(n+len(pm_file_suffix)<=len(buffer)) then 
+       buffer(n+1:)=pm_file_suffix
+    endif
+  end subroutine pm_module_filename
 
 end module pm_sysdep