From 349a3ab9d33138452ff52d6959c98a994c64c2af Mon Sep 17 00:00:00 2001 From: interkosmos Date: Thu, 2 Jan 2020 23:42:43 +0100 Subject: [PATCH 1/4] Added Fortran block statement. --- src/languages/fortran.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/languages/fortran.js b/src/languages/fortran.js index 74e194a022..14911271ef 100644 --- a/src/languages/fortran.js +++ b/src/languages/fortran.js @@ -14,7 +14,7 @@ function(hljs) { var F_KEYWORDS = { literal: '.False. .True.', keyword: 'kind do while private call intrinsic where elsewhere ' + - 'type endtype endmodule endselect endinterface end enddo endif if forall endforall only contains default return stop then ' + + 'type endtype endmodule endselect endinterface end enddo endif if forall endforall only contains default return stop then block ' + 'public subroutine|10 function program .and. .or. .not. .le. .eq. .ge. .gt. .lt. ' + 'goto save else use module select case ' + 'access blank direct exist file fmt form formatted iostat name named nextrec number opened rec recl sequential status unformatted unit ' + From d4401a23e64cb23ea9c93aebf160a103830b70bc Mon Sep 17 00:00:00 2001 From: interkosmos Date: Fri, 3 Jan 2020 01:09:30 +0100 Subject: [PATCH 2/4] Added Fortran endblock. --- src/languages/fortran.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/languages/fortran.js b/src/languages/fortran.js index 14911271ef..aecd3dcc7e 100644 --- a/src/languages/fortran.js +++ b/src/languages/fortran.js @@ -14,7 +14,7 @@ function(hljs) { var F_KEYWORDS = { literal: '.False. .True.', keyword: 'kind do while private call intrinsic where elsewhere ' + - 'type endtype endmodule endselect endinterface end enddo endif if forall endforall only contains default return stop then block ' + + 'type endtype endmodule endselect endinterface end enddo endif if forall endforall only contains default return stop then block endblock ' + 'public subroutine|10 function program .and. .or. .not. .le. .eq. .ge. .gt. .lt. ' + 'goto save else use module select case ' + 'access blank direct exist file fmt form formatted iostat name named nextrec number opened rec recl sequential status unformatted unit ' + From 5ffc98c19d33b3e00150cc3ab04e36f3b3b14062 Mon Sep 17 00:00:00 2001 From: interkosmos Date: Fri, 3 Jan 2020 16:38:11 +0100 Subject: [PATCH 3/4] Added PR. --- CHANGES.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGES.md b/CHANGES.md index c273c236d8..515fc98033 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -14,6 +14,7 @@ Core Changes: Language Improvements: +- (fortran) added block keyword (#2343) [Philipp Engel][] - (javascript) support jsx fragments (#2333) [Josh Goebel][] - (ini) support TOML arrays, clean up grammar (#2335) [Josh Goebel][] - (vbnet) add nameof operator to the keywords (#2329) [Youssef Victor][] @@ -21,6 +22,7 @@ Language Improvements: [Jeffrey Arnold]: https://github.com/jrnold [Josh Goebel]: https://github.com/yyyc514 +[Philipp Engel]: https://github.com/interkosmos [Youssef Victor]: https://github.com/Youssef1313 From 55b97d4fa5bcf9991942411538dfbb42e234a2d8 Mon Sep 17 00:00:00 2001 From: Josh Goebel Date: Fri, 3 Jan 2020 15:16:02 -0500 Subject: [PATCH 4/4] Update CHANGES.md --- CHANGES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 515fc98033..7096ef2964 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -14,7 +14,7 @@ Core Changes: Language Improvements: -- (fortran) added block keyword (#2343) [Philipp Engel][] +- (fortran) added `block` and `endblock` keywords (#2343) [Philipp Engel][] - (javascript) support jsx fragments (#2333) [Josh Goebel][] - (ini) support TOML arrays, clean up grammar (#2335) [Josh Goebel][] - (vbnet) add nameof operator to the keywords (#2329) [Youssef Victor][]