Runtime(fortran): updates to indent, syntax and ftplugin (#13752)
Commit:
https://github.com/vim/vim/commit/ea9964a36f948c1266d43dd8b3890c6f3bdd243d
Author: Ajit-Thakkar <[email protected]>
Date: Sat Dec 23 06:31:38 2023 -0400
Runtime(fortran): updates to indent, syntax and ftplugin
(https://github.com/vim/vim/issues/13752)
* runtime update fortran.vim
Add folding for newer features of Fortran
* Runtime Update fortran.vim
Add indent support for newer features of Fortran
* Runtime Update fortran.vim
Add newer features of Fortran to matchit patterns
Signed-off-by: Ajit-Thakkar
<[email protected]>
Signed-off-by: Christian Brabandt <[email protected]>
diff --git a/runtime/ftplugin/fortran.vim b/runtime/ftplugin/fortran.vim
index a057db9a4..d714a4ac4 100644
--- a/runtime/ftplugin/fortran.vim
+++ b/runtime/ftplugin/fortran.vim
@@ -1,6 +1,6 @@
" Vim settings file
-" Language: Fortran 2008 (and older: Fortran 2003, 95, 90, 77, 66)
-" Version: (v54) 2023 December 5
+" Language: Fortran 2023 (and Fortran 2018, 2008, 2003, 95, 90, 77, 66)
+" Version: (v55) 2023 December 22
" Maintainers: Ajit J. Thakkar <[email protected]>; <https://ajit.ext.unb.ca/>
" Joshua Hollett <[email protected]>
" Usage: For instructions, do :help fortran-plugin from Vim
@@ -110,7 +110,9 @@ if !exists("b:match_words")
let b:match_ignorecase = 1
let b:match_words =
\ '(:),' .
- \ '\<select\s*case\>:' . s:notselect. '\<case\>:\<end\s*select\>,' .
+ \ s:notend .'\<select\s\+type\>:' . s:notselect.
'\<type\|class\>:\<end\s*select\>,' .
+ \ s:notend .'\<select\s\+rank\>:' . s:notselect.
'\<rank\>:\<end\s*select\>,' .
+ \ s:notend .'\<select\>:' . s:notselect.
'\<case\>:\<end\s*select\>,' .
\ s:notelse . '\<if\s*(.\+)\s*then\>:' .
\ s:nothash . '\<else\s*\%(if\s*(.\+)\s*then\)\=\>:' . s:nothash .
'\<end\s*if\>,'.
\ 'do\s\+\(\d\+\):\%(^\s*\)\@<= \s,'.
@@ -119,6 +121,9 @@ if !exists("b:match_words")
\ s:notend . '\<type\s*[^(]:\<end\s*type\>,'.
\ s:notend . '\<forall\>:\<end\s*forall\>,'.
\ s:notend . '\<associate\>:\<end\s*associate\>,'.
+ \ s:notend . '\<change\s\+team\>:\<end\s*team\>,'.
+ \ s:notend . '\<critical\>:\<end\s*critical\>,'.
+ \ s:notend . '\<block\>:\<end\s*block\>,'.
\ s:notend . '\<enum\>:\<end\s*enum\>,'.
\ s:notend . '\<interface\>:\<end\s*interface\>,'.
\ s:notend . '\<subroutine\>:\<end\s*subroutine\>,'.
diff --git a/runtime/indent/fortran.vim b/runtime/indent/fortran.vim
index 7130658f5..392b2d29d 100644
--- a/runtime/indent/fortran.vim
+++ b/runtime/indent/fortran.vim
@@ -1,6 +1,6 @@
" Vim indent file
-" Language: Fortran 2008 (and Fortran 2003, 95, 90, and 77)
-" Version: (v49) 2023 December 1
+" Language: Fortran 2023 (and Fortran 2018, 2008, 2003, 95, 90, 77, 66)
+" Version: (v50) 2023 December 22
" Maintainers: Ajit J. Thakkar <[email protected]>; <https://ajit.ext.unb.ca/>
" Joshua Hollett <[email protected]>
" Usage: For instructions, do :help fortran-indent from Vim
@@ -22,8 +22,8 @@ let b:undo_indent = "setl inde< indk<"
setlocal indentkeys+==~end,=~case,=~if,=~else,=~do,=~where,=~elsewhere,=~select
setlocal indentkeys+==~endif,=~enddo,=~endwhere,=~endselect,=~elseif
-setlocal indentkeys+==~type,=~interface,=~forall,=~associate,=~block,=~enum
-setlocal indentkeys+==~endforall,=~endassociate,=~endblock,=~endenum
+setlocal indentkeys+==~interface,=~forall,=~associate,=~block,=~enum,=~critical
+setlocal
indentkeys+==~endforall,=~endassociate,=~endblock,=~endenum,=~endcritical
if exists("b:fortran_indent_more") || exists("g:fortran_indent_more")
setlocal indentkeys+==~function,=~subroutine,=~module,=~contains,=~program
setlocal indentkeys+==~endfunction,=~endsubroutine,=~endmodule
@@ -49,7 +49,7 @@ if !exists("b:fortran_fixed_source")
" Fixed-form file extension defaults
let b:fortran_fixed_source = 1
else
- " Modern fortran still allows both fixed and free source form
+ " Modern fortran compilers still allow both fixed and free source form
" Assume fixed source form unless signs of free source form
" are detected in the first five columns of the first s:lmax lines.
" Detection becomes more accurate and time-consuming if more lines
@@ -109,8 +109,9 @@ function FortranGetIndent(lnum)
"Add a shiftwidth to statements following if, else, else if, case, class,
"where, else where, forall, type, interface and associate statements
- if prevstat =~? '^\s*\(case\|class\|else\|else\s*if\|else\s*where\)\>'
- \ ||prevstat=~? '^\s*\(type\|interface\|associate\|enum\)\>'
+ if prevstat =~? '^\s*\(case\|class\s\+is\|else\|else\s*if\|else\s*where\)\>'
+ \ ||prevstat=~?
'^\s*\(type\|rank\|interface\|associate\|enum\|critical\)\>'
+ \ ||prevstat=~? '^\s*change\s\+team\>'
\ ||prevstat=~?'^\s*\(\d\+\s\)\=\s*\(
\w*\s*:\)\=\s*\(forall\|where\|block\)\>'
\ ||prevstat=~? '^\s*\(\d\+\s\)\=\s*\( \w*\s*:\)\=\s*if\>'
let ind = ind + shiftwidth()
@@ -145,10 +146,10 @@ function FortranGetIndent(lnum)
"Subtract a shiftwidth from else, else if, elsewhere, case, class, end if,
" end where, end select, end forall, end interface, end associate,
- " end enum, end type, end block and end type statements
+ " end enum, end type, end block, end team and end type statements
if getline(v:lnum) =~? '^\s*\(\d\+\s\)\=\s*'
- \. '\(else\|else\s*if\|else\s*where\|case\|class\|'
- \. 'end\s*\(if\|where\|select\|interface\|'
+ \. '\(else\|else\s*if\|else\s*where\|case\|class\|rank\|type\s\+is\|'
+ \. 'end\s*\(if\|where\|select\|interface\|critical\|team\|'
\. 'type\|forall\|associate\|enum\|block\)\)\>'
let ind = ind - shiftwidth()
" Fix indent for case statement immediately after select
diff --git a/runtime/syntax/fortran.vim b/runtime/syntax/fortran.vim
index 7ed4f8a26..b7fae54d9 100644
--- a/runtime/syntax/fortran.vim
+++ b/runtime/syntax/fortran.vim
@@ -1,6 +1,6 @@
" Vim syntax file
" Language: Fortran 2023 (and Fortran 2018, 2008, 2003, 95, 90, and 77)
-" Version: (v107) 2023 December 17
+" Version: (v108) 2023 December 22
" Maintainers: Ajit J. Thakkar <[email protected]>; <https://ajit.ext.unb.ca/>
" Joshua Hollett <[email protected]>
" Usage: For instructions, do :help fortran-syntax from Vim
@@ -75,6 +75,8 @@ syn match fortranConstructName
"\(\<end\s*where\s\+\)\@14<= \w*"
syn match fortranConstructName "\(\<end\s*block\s\+\)\@14<= \w*"
syn match fortranConstructName "\(\<\%(exit\|cycle\)\s\+\)\@11<= \w*"
syn match fortranConstructName "\(\<end\s*forall\s\+\)\@15<= \w*\>"
+syn match fortranConstructName "\(\<end\s*critical\s\+\)\@17<= \w*\>"
+syn match fortranConstructName "\(\<end\s*associate\s\+\)\@18<= \w*\>"
syn match fortranUnitName
"\(\(end\s*\)\?\(subroutine\|function\|module\|program\|submodule\)\s\+\)\@12<=
\w\+"
syn match fortranUnitHeader "\<end\s*$"
@@ -84,10 +86,13 @@ syn keyword fortranIntrinsicR achar iachar transfer
dble dprod dim lge lgt lle l
syn keyword fortranIntrinsic command_argument_count get_command
get_command_argument get_environment_variable is_iostat_end is_iostat_eor
move_alloc new_line same_type_as extends_type_of
syn keyword fortranIntrinsic selected_real_kind selected_int_kind
selected_logical_kind selected_char_kind
syn keyword fortranIntrinsic acosh asinh atanh bessel_j0 bessel_j1
bessel_jn bessel_y0 bessel_y1 bessel_yn erf erfc erfc_scaled gamma log_gamma
hypot norm2
-syn keyword fortranIntrinsic adjustl adjustr all allocated any associated
bit_size btest ceiling count cshift date_and_time digits
-syn keyword fortranIntrinsic dot_product eoshift epsilon exponent floor
fraction huge iand ibclr ibits ibset ieor ior ishft ishftc lbound len_trim
matmul maxexponent maxloc maxval merge minexponent minloc
-syn keyword fortranIntrinsic minval modulo mvbits nearest pack precision
present product radix random_number random_seed range repeat reshape rrspacing
scale scan set_exponent shape size spacing
-syn keyword fortranIntrinsic spread sum system_clock tiny transpose trim
ubound unpack verify
+syn keyword fortranIntrinsic adjustl adjustr all allocated any associated
bit_size btest ceiling cshift date_and_time digits
+syn keyword fortranIntrinsic dot_product eoshift exponent floor fraction
iand ibclr ibits ibset ieor ior ishft ishftc lbound len_trim matmul maxexponent
maxloc merge minexponent minloc
+syn keyword fortranIntrinsic modulo mvbits nearest pack precision present
radix random_number random_seed range repeat reshape rrspacing scale scan
set_exponent shape size spacing
+"syn keyword fortranIntrinsic count epsilon maxval minval product sum huge
tiny
+" intrinsic names often used for variables in older Fortran code
+syn match fortranIntrinsic
'\<\(count\|epsilon\|maxval\|minval\|product\|sum\|huge\|tiny\)\>\ze\s*('
+syn keyword fortranIntrinsic spread system_clock transpose trim ubound
unpack verify
syn keyword fortranIntrinsic atomic_define atomic_ref execute_command_line
leadz trailz storage_size merge_bits
syn keyword fortranIntrinsic bge bgt ble blt dshiftl dshiftr findloc iall
iany iparity image_index lcobound ucobound maskl maskr num_images parity popcnt
poppar shifta shiftl shiftr this_image
syn keyword fortranIntrinsic null cpu_time failed_images stopped_images
image_status co_broadcast co_max co_min co_sum co_reduce
@@ -99,7 +104,6 @@ syn keyword fortranIntrinsic iso_c_binding c_loc c_funloc
c_sizeof c_associat
syn keyword fortranIntrinsic out_of_range reduce random_init coshape
syn keyword fortranIntrinsic acosd asind atand atan2d cosd sind tand acospi
asinpi atanpi atan2pi cospi sinpi tanpi
syn keyword fortranIntrinsic compiler_options compiler_version get_team
team_number
-"syn match fortranIntrinsic
'\<\(count\|dot_product\|epsilon\|exponent\|fraction\|matmul\|maxval\|minval\|modulo\|nearest\|pack\|precision\|product\|radix\|random_number\|random_seed\|range\|repeat\|reshape\|rrspacing\|scale\|scan\|set_exponent\|shape\|size\|sum\|tiny\|transpose\)\>\ze\s*('
syn match fortranIntrinsic "\<real\s*("me=s+4
syn match fortranIntrinsic "\<logical\s*("me=s+7
syn match fortranIntrinsic "\<not\s*("me=s+3
@@ -351,8 +355,10 @@ if exists("fortran_fold")
syn region fortranModule transparent fold keepend
start="^\s*module\s\+\(procedure\)\@!\z( \w*\)" skip="^\([!c*]\|\s*#\).*$"
excludenl end="\<end\s*\(module\(\s\+\z1\>\)\=\|$\)"
contains=ALLBUT,fortranProgram
syn region fortranFunction transparent fold keepend extend
start="^\s*\(elemental \|pure \|impure \|module \|recursive \)\=\s*\(\(\(real
\|integer \|logical \|complex \|double \s*precision
\)\s*\((\(\s*kind\s*=\)\=\s*\w\+\s*)\)\=\)\|type\s\+(\s*\w\+\s*) \|character
\((\(\s*len\s*=\)\=\s*\d\+\s*)\|(\(\s*kind\s*=\)\=\s*\w\+\s*)\)\=\)\=\s*function\s\+\z(
\w*\)" skip="^\([!c*]\|\s*#\).*$" excludenl
end="\<end\s*\($\|function\(\s\+\z1\>\)\=\)"
contains=ALLBUT,fortranProgram,fortranModule
syn region fortranSubroutine transparent fold keepend extend
start="^\s*\(elemental \|pure \|impure \|module \|recursive
\)\=\s*subroutine\s\+\z( \w*\)" skip="^\([!c*]\|\s*#\).*$" excludenl
end="\<end\s*\($\|subroutine\(\s\+\z1\>\)\=\)"
contains=ALLBUT,fortranProgram,fortranModule
- syn region fortranBlockData transparent fold keepend
start="\<block\s*data\(\s\+\z( \w*\)\)\=" skip="^\([!c*]\|\s*#\).*$" excludenl
end="\<end\s*\($\|block\s*data\(\s\+\z1\>\)\=\)"
contains=ALLBUT,fortranProgram,fortranModule,fortranSubroutine,fortranFunction,fortran77Loop,fortranCase,fortran90Loop,fortranIfBlock
+ syn region fortranBlockData transparent fold keepend start="\<block\>"
skip="^\s*[!#].*$" excludenl end="\<end\s*block\>"
contains=ALLBUT,fortranProgram,fortranModule,fortranSubroutine,fortranFunction,fortran77Loop,fortranCase,fortran90Loop,fortranIfBlock
syn region fortranAssociate transparent fold keepend
start="^\s*\<associate\s\+" skip="^\([!c*]\|\s*#\).*$" excludenl
end="\<end\s*associate"
contains=ALLBUT,fortranProgram,fortranModule,fortranSubroutine,fortranFunction
+ syn region fortranCritical transparent fold keepend
start="^\s*\<critical\s\+" skip="^\([!c*]\|\s*#\).*$" excludenl
end="\<end\s*critical"
contains=ALLBUT,fortranProgram,fortranModule,fortranSubroutine,fortranFunction
+ syn region fortranTeam transparent fold keepend
start="^\s*\<change\s\+team\>" skip="^\([!c*]\|\s*#\).*$" excludenl
end="\<end\s*team\>"
contains=ALLBUT,fortranProgram,fortranModule,fortranSubroutine,fortranFunction
syn region fortranInterface transparent fold keepend extend
start="^\s*\(abstract \)\=\s*interface\>" skip="^\([!c*]\|\s*#\).*$" excludenl
end="\<end\s*interface\>"
contains=ALLBUT,fortranProgram,fortranModule,fortran77Loop,fortranCase,fortran90Loop,fortranIfBlock
syn region fortranTypeDef transparent fold keepend extend
start="^\s*type\s*\(,\s*\(public\|private\|abstract\)\)\=\s*::"
skip="^\([!c*]\|\s*#\).*$" excludenl end="\<end\s*type\>"
contains=ALLBUT,fortranProgram,fortranModule,fortran77Loop,fortranCase,fortran90Loop,fortranIfBlock,fortranInterface
else
@@ -361,8 +367,10 @@ if exists("fortran_fold")
syn region fortranModule transparent fold keepend
start="^\s*module\s\+\(procedure\)\@!\z( \w*\)" skip="^\s*[!#].*$" excludenl
end="\<end\s*\(module\(\s\+\z1\>\)\=\|$\)" contains=ALLBUT,fortranProgram
syn region fortranFunction transparent fold keepend extend
start="^\s*\(elemental \|pure \|impure \|module \|recursive \)\=\s*\(\(\(real
\|integer \|logical \|complex \|double \s*precision
\)\s*\((\(\s*kind\s*=\)\=\s*\w\+\s*)\)\=\)\|type\s\+(\s*\w\+\s*) \|character
\((\(\s*len\s*=\)\=\s*\d\+\s*)\|(\(\s*kind\s*=\)\=\s*\w\+\s*)\)\=\)\=\s*function\s\+\z(
\w*\)" skip="^\s*[!#].*$" excludenl
end="\<end\s*\($\|function\(\s\+\z1\>\)\=\)"
contains=ALLBUT,fortranProgram,fortranModule
syn region fortranSubroutine transparent fold keepend extend
start="^\s*\(elemental \|pure \|impure \|module \|recursive
\)\=\s*subroutine\s\+\z( \w*\)" skip="^\s*[!#].*$" excludenl
end="\<end\s*\($\|subroutine\(\s\+\z1\>\)\=\)"
contains=ALLBUT,fortranProgram,fortranModule
- syn region fortranBlockData transparent fold keepend
start="\<block\s*data\(\s\+\z( \w*\)\)\=" skip="^\s*[!#].*$" excludenl
end="\<end\s*\($\|block\s*data\(\s\+\z1\>\)\=\)"
contains=ALLBUT,fortranProgram,fortranModule,fortranSubroutine,fortranFunction,fortran77Loop,fortranCase,fortran90Loop,fortranIfBlock
- syn region fortranAssociate transparent fold keepend
start="^\s*\<associate\s\+" skip="^\s*[!#].*$" excludenl
end="\<end\s*associate"
contains=ALLBUT,fortranProgram,fortranModule,fortranSubroutine,fortranFunction
+ syn region fortranBlockData transparent fold keepend start="\<block\>"
skip="^\s*[!#].*$" excludenl end="\<end\s*block\>"
contains=ALLBUT,fortranProgram,fortranModule,fortranSubroutine,fortranFunction,fortran77Loop,fortranCase,fortran90Loop,fortranIfBlock
+ syn region fortranAssociate transparent fold keepend start="\<associate\>"
skip="^\s*[!#].*$" excludenl end="\<end\s*associate\>"
contains=ALLBUT,fortranProgram,fortranModule,fortranSubroutine,fortranFunction
+ syn region fortranCritical transparent fold keepend start="\<critical\>"
skip="^\s*[!#].*$" excludenl end="\<end\s*critical\>"
contains=ALLBUT,fortranProgram,fortranModule,fortranSubroutine,fortranFunction
+ syn region fortranTeam transparent fold keepend start="\<change\s\+team\>"
skip="^\s*[!#].*$" excludenl end="\<end\s*team\>"
contains=ALLBUT,fortranProgram,fortranModule,fortranSubroutine,fortranFunction
syn region fortranInterface transparent fold keepend extend
start="^\s*\(abstract \)\=\s*interface\>" skip="^\s*[!#].*$" excludenl
end="\<end\s*interface\>"
contains=ALLBUT,fortranProgram,fortranModule,fortran77Loop,fortranCase,fortran90Loop,fortranIfBlock
syn region fortranTypeDef transparent fold keepend extend
start="^\s*type\s*\(,\s*\(public\|private\|abstract\)\)\=\s*::"
skip="^\s*[!#].*$" excludenl end="\<end\s*type\>"
contains=ALLBUT,fortranProgram,fortranModule,fortran77Loop,fortranCase,fortran90Loop,fortranIfBlock,fortranInterface
endif
@@ -372,12 +380,12 @@ if exists("fortran_fold")
syn region fortran77Loop transparent fold keepend
start="\<do\s\+\z(\d\+\)" end="^\s*\z1\>"
contains=ALLBUT,fortranUnitHeader,fortranAttribute,fortranStorageClass,fortranType,fortranProgram,fortranModule,fortranSubroutine,fortranFunction,fortranBlockData
syn region fortran90Loop transparent fold keepend extend
start="\(\<end\s\+\)\@<!\<do\(\s\+ \|\s*$\)" skip="^\([!c*]\|\s*#\).*$"
excludenl end="\<end\s*do\>"
contains=ALLBUT,fortranUnitHeader,fortranAttribute,fortranStorageClass,fortranType,fortranProgram,fortranModule,fortranSubroutine,fortranFunction,fortranBlockData
syn region fortranIfBlock transparent fold keepend extend
start="\(\<e\(nd\|lse\)\s\+\)\@<!\<if\s*(.\+)\s*then\>"
skip="^\([!c*]\|\s*#\).*$" end="\<end\s*if\>"
contains=ALLBUT,fortranUnitHeader,fortranAttribute,fortranStorageClass,fortranType,fortranProgram,fortranModule,fortranSubroutine,fortranFunction,fortranBlockData
- syn region fortranCase transparent fold keepend extend
start="\<select\s*\(case\|type\)\>" skip="^\([!c*]\|\s*#\).*$"
end="\<end\s*select\>"
contains=ALLBUT,fortranUnitHeader,fortranAttribute,fortranStorageClass,fortranType,fortranProgram,fortranModule,fortranSubroutine,fortranFunction,fortranBlockData
+ syn region fortranCase transparent fold keepend extend
start="\<select\s*\(case\|type\|rank\)\>" skip="^\([!c*]\|\s*#\).*$"
end="\<end\s*select\>"
contains=ALLBUT,fortranUnitHeader,fortranAttribute,fortranStorageClass,fortranType,fortranProgram,fortranModule,fortranSubroutine,fortranFunction,fortranBlockData
else
syn region fortran77Loop transparent fold keepend
start="\<do\s\+\z(\d\+\)" end="^\s*\z1\>"
contains=ALLBUT,fortranUnitHeader,fortranAttribute,fortranStorageClass,fortranType,fortranProgram,fortranModule,fortranSubroutine,fortranFunction,fortranBlockData
syn region fortran90Loop transparent fold keepend extend
start="\(\<end\s\+\)\@<!\<do\(\s\+ \|\s*$\)" skip="^\s*[!#].*$" excludenl
end="\<end\s*do\>"
contains=ALLBUT,fortranUnitHeader,fortranAttribute,fortranStorageClass,fortranType,fortranProgram,fortranModule,fortranSubroutine,fortranFunction,fortranBlockData
syn region fortranIfBlock transparent fold keepend extend
start="\(\<e\(nd\|lse\)\s\+\)\@<!\<if\s*(\(.\|&\s*
\)\+)\(\s\|&\s*
\)*then\>" skip="^\s*[!#].*$" end="\<end\s*if\>"
contains=ALLBUT,fortranUnitHeader,fortranAttribute,fortranStorageClass,fortranType,fortranProgram,fortranModule,fortranSubroutine,fortranFunction,fortranBlockData
- syn region fortranCase transparent fold keepend extend
start="\<select\s*\(case\|type\)\>" skip="^\s*[!#].*$" end="\<end\s*select\>"
contains=ALLBUT,fortranUnitHeader,fortranAttribute,fortranStorageClass,fortranType,fortranProgram,fortranModule,fortranSubroutine,fortranFunction,fortranBlockData
+ syn region fortranCase transparent fold keepend extend
start="\<select\s*\(case\|type\|rank\)\>" skip="^\s*[!#].*$"
end="\<end\s*select\>"
contains=ALLBUT,fortranUnitHeader,fortranAttribute,fortranStorageClass,fortranType,fortranProgram,fortranModule,fortranSubroutine,fortranFunction,fortranBlockData
endif
endif
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To view this discussion on the web visit
https://groups.google.com/d/msgid/vim_dev/E1rGzV8-009e0v-Lp%40256bit.org.
