diff options
author | Sebastian Engel <dev@sebastianengel.eu> | 2021-11-14 19:29:58 +0100 |
---|---|---|
committer | Sebastian Engel <dev@sebastianengel.eu> | 2021-11-14 19:29:58 +0100 |
commit | fd21d1fb469f3dd9144c12909e140d159ce7af91 (patch) | |
tree | 88a690e50161da5c2c2d278aa6ddd90403bfe787 | |
parent | 80e1363d7d05a38cd478f62cad6260e46ed888b2 (diff) | |
download | pygments-git-fd21d1fb469f3dd9144c12909e140d159ce7af91.tar.gz |
Modernize Whitespace token in lexer: forth
-rw-r--r-- | pygments/lexers/forth.py | 11 | ||||
-rw-r--r-- | tests/examplefiles/forth/demo.frt.output | 34 |
2 files changed, 23 insertions, 22 deletions
diff --git a/pygments/lexers/forth.py b/pygments/lexers/forth.py index 563fdab0..1f67aa4e 100644 --- a/pygments/lexers/forth.py +++ b/pygments/lexers/forth.py @@ -11,7 +11,8 @@ import re from pygments.lexer import RegexLexer, bygroups -from pygments.token import Text, Comment, Keyword, Name, String, Number +from pygments.token import Text, Comment, Keyword, Name, String, Number, \ + Whitespace __all__ = ['ForthLexer'] @@ -32,15 +33,15 @@ class ForthLexer(RegexLexer): tokens = { 'root': [ - (r'\s+', Text), + (r'\s+', Whitespace), # All comment types - (r'\\.*?\n', Comment.Single), + (r'\\.*?$', Comment.Single), (r'\([\s].*?\)', Comment.Single), # defining words. The next word is a new command name (r'(:|variable|constant|value|buffer:)(\s+)', - bygroups(Keyword.Namespace, Text), 'worddef'), + bygroups(Keyword.Namespace, Whitespace), 'worddef'), # strings are rather simple - (r'([.sc]")(\s+?)', bygroups(String, Text), 'stringdef'), + (r'([.sc]")(\s+?)', bygroups(String, Whitespace), 'stringdef'), # keywords from the various wordsets # *** Wordset BLOCK (r'(blk|block|buffer|evaluate|flush|load|save-buffers|update|' diff --git a/tests/examplefiles/forth/demo.frt.output b/tests/examplefiles/forth/demo.frt.output index 53d9d03a..2762d357 100644 --- a/tests/examplefiles/forth/demo.frt.output +++ b/tests/examplefiles/forth/demo.frt.output @@ -1,36 +1,36 @@ '2' Literal.Number.Integer -' ' Text +' ' Text.Whitespace '3' Literal.Number.Integer -' ' Text +' ' Text.Whitespace '+' Keyword -' ' Text +' ' Text.Whitespace 'CR' Keyword -' ' Text +' ' Text.Whitespace '.' Keyword -'\n' Text +'\n' Text.Whitespace ':' Keyword.Namespace -' ' Text +' ' Text.Whitespace 'F' Name.Class -' ' Text +' ' Text.Whitespace '( blah )' Comment.Single -' ' Text +' ' Text.Whitespace 'DUP' Keyword -' ' Text +' ' Text.Whitespace 'DROP' Keyword -' ' Text +' ' Text.Whitespace '1' Literal.Number.Integer -' ' Text +' ' Text.Whitespace '+' Keyword -' ' Text +' ' Text.Whitespace ';' Keyword -'\n' Text +'\n' Text.Whitespace '1' Literal.Number.Integer -' ' Text +' ' Text.Whitespace 'F' Name.Function -' ' Text +' ' Text.Whitespace 'CR' Keyword -' ' Text +' ' Text.Whitespace '.' Keyword -'\n' Text +'\n' Text.Whitespace |