summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2014-09-16 10:10:31 +0200
committerGeorg Brandl <georg@python.org>2014-09-16 10:10:31 +0200
commit44a52b8a665328afece9780ea34687ad2b27b245 (patch)
treef01774f1929af099384f99fb54d354001b409505
parent90af20b186242fa9a96b3f86173261a192fd80bf (diff)
downloadpygments-44a52b8a665328afece9780ea34687ad2b27b245.tar.gz
Add optional whitespace in F90 "end" constructs.
-rw-r--r--pygments/lexers/compiled.py15
1 files changed, 8 insertions, 7 deletions
diff --git a/pygments/lexers/compiled.py b/pygments/lexers/compiled.py
index 61b4ffe4..dd1249fc 100644
--- a/pygments/lexers/compiled.py
+++ b/pygments/lexers/compiled.py
@@ -1586,10 +1586,11 @@ class FortranLexer(RegexLexer):
r'ASSOCIATE|ASYNCHRONOUS|BACKSPACE|BIND|BLOCK|BLOCKDATA|BYTE|CALL|'
r'CASE|CLASS|CLOSE|CODIMENSION|COMMON|CONCURRRENT|CONTIGUOUS|'
r'CONTAINS|CONTINUE|CRITICAL|CYCLE|DATA|DEALLOCATE|DECODE|DEFERRED|'
- r'DIMENSION|DO|ELEMENTAL|ELSE|ENCODE|ENDASSOCIATE|ENDBLOCK|'
- r'ENDBLOCKDATA|ENDCRITICAL|ENDDO|ENDFILE|ENDFORALL|ENDFUNCTION|ENDIF|'
- r'ENDINTERFACE|ENDMODULE|ENDPROCEDURE|ENDPROGRAM|ENDSELECT|'
- r'ENDSUBMODULE|ENDSUBROUTINE|ENDTYPE|ENDWHERE|ENTRY|ENUM|ENUMERATOR|'
+ r'DIMENSION|DO|ELEMENTAL|ELSE|ENCODE|END\s*ASSOCIATE|END\s*BLOCK|'
+ r'END\s*BLOCKDATA|END\s*CRITICAL|END\s*DO|END\s*FILE|END\s*FORALL|'
+ r'END\s*FUNCTION|END\s*IF|END\s*INTERFACE|END\s*MODULE|END\s*PROCEDURE|'
+ r'END\s*PROGRAM|END\s*SELECT|END\s*SUBMODULE|END\s*SUBROUTINE|'
+ r'END\s*TYPE|END\s*WHERE|ENTRY|ENUM|ENUMERATOR|'
r'EQUIVALENCE|EXIT|EXTENDS|EXTERNAL|EXTRINSIC|FINAL|FORALL|FORMAT|'
r'FUNCTION|GENERIC|GOTO|IF|IMAGES|IMPLICIT|IMPORT|IMPURE|INCLUDE|'
r'INQUIRE|INTENT|INTERFACE|INTRINSIC|IS|LOCK|MEMORY|MODULE|NAMELIST|'
@@ -1627,14 +1628,14 @@ class FortranLexer(RegexLexer):
r'BesY|BesYN|BGE|BGT|BLE|BLT|Bit_Size|BTest|CAbs|CCos|Ceiling|'
r'CExp|Char|ChDir|ChMod|CLog|Cmplx|Command_Argument_Count|Complex|'
r'Conjg|Cos|CosH|Count|CPU_Time|CShift|CSin|CSqRt|CTime|C_Funloc|'
- r'C_Loc|C_Associated|C_Null_Ptr|C_Null_Funptr|C_F_Pointer|
+ r'C_Loc|C_Associated|C_Null_Ptr|C_Null_Funptr|C_F_Pointer|'
r'C_F_ProcPointer|C_Null_Char|C_Alert|C_Backspace|C_Form_Feed|'
- r'C_FunLoc|C_Loc|C_SizeofC_New_Line|'
+ r'C_FunLoc|C_Loc|C_Sizeof|C_New_Line|'
r'C_Carriage_Return|C_Horizontal_Tab|C_Vertical_Tab|'
r'DAbs|DACos|DASin|DATan|Date_and_Time|DbesJ|'
r'DbesJ|DbesJN|DbesY|DbesY|DbesYN|Dble|DCos|DCosH|DDiM|DErF|DErFC|'
r'DExp|Digits|DiM|DInt|DLog|DLog|DMax|DMin|DMod|DNInt|Dot_Product|'
- r'DProd|DSign|DSinH|DShiftL|DShiftR|DSin|DSqRt|DTanH|DTan|DTime|
+ r'DProd|DSign|DSinH|DShiftL|DShiftR|DSin|DSqRt|DTanH|DTan|DTime|'
r'EOShift|Epsilon|ErF|ErFC|ErFC_Scaled|ETime|Execute_Command_Line|'
r'Exit|Exp|Exponent|Extends_Type_Of|FDate|FGet|FGetC|'
r'FindLoc|Float|Floor|Flush|FNum|FPutC|FPut|Fraction|FSeek|FStat|'