eric: comparison eric6/ThirdParty/Pygments/pygments/lexers/csound.py

-:bf5f777260a6
+:21b0534faebc
 pygments.lexers.csound
 ~~~~~~~~~~~~~~~~~~~~~~
 Lexers for Csound languages.
-:copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+:copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
 :license: BSD, see LICENSE for details.
 """
 import re
 (r'(\\)(\n)', bygroups(Whitespace, Text))
 ],
 'preprocessor directives': [
 (r'#(?:e(?:nd(?:if)?|lse)\b|##)|@@?[ \t]*\d+', Comment.Preproc),
+(r'#includestr', Comment.Preproc, 'includestr directive'),
 (r'#include', Comment.Preproc, 'include directive'),
 (r'#[ \t]*define', Comment.Preproc, 'define directive'),
 (r'#(?:ifn?def|undef)\b', Comment.Preproc, 'macro directive')
 ],
 'include directive': [
 include('whitespace'),
 (r'([^ \t]).*?\1', String, '#pop')
+],
+'includestr directive': [
+include('whitespace'),
+(r'"', String, ('#pop', 'quoted string'))
 ],
 'define directive': [
 (r'\n', Text),
 include('whitespace'),
 (r'\d+[Ee][+-]?\d+|(\d+\.\d*|\d*\.\d+)([Ee][+-]?\d+)?', Number.Float),
 (r'(0[Xx])([0-9A-Fa-f]+)', bygroups(Keyword.Type, Number.Hex)),
 (r'\d+', Number.Integer)
 ],
+'quoted string': [
+(r'"', String, '#pop'),
+(r'[^"$]+', String),
+include('macro uses'),
+(r'[$]', String)
+],
 'braced string': [
 # Do nothing. This must be defined in subclasses.
 ]
 }
 class CsoundScoreLexer(CsoundLexer):
 """
-For `Csound <https://csound.github.io>`_ scores.
+For `Csound <https://csound.com>`_ scores.
 .. versionadded:: 2.1
 """
 name = 'Csound Score'
 # used; see https://github.com/csound/csound/issues/750.
 (r'z', Keyword.Constant),
 # z is a constant equal to 800,000,000,000. 800 billion seconds is about
 # 25,367.8 years. See also
-# https://csound.github.io/docs/manual/ScoreTop.html and
+# https://csound.com/docs/manual/ScoreTop.html and
 # https://github.com/csound/csound/search?q=stof+path%3AEngine+filename%3Asread.c.
 (r'([nNpP][pP])(\d+)', bygroups(Keyword, Number.Integer)),
 (r'[mn]', Keyword, 'mark statement'),
 include('whitespace and macro uses'),
 (r'[A-Z_a-z]\w*', Name.Label),
 (r'\n', Text, '#pop')
 ],
-'quoted string': [
-(r'"', String, '#pop'),
-(r'[^"$]+', String),
-include('macro uses'),
-(r'[$]', String)
-],
 'loop after left brace': [
 include('whitespace and macro uses'),
 (r'\d+', Number.Integer, ('#pop', 'loop after repeat count')),
 ],
 'loop after repeat count': [
 'loop': [
 (r'\}', Comment.Preproc, '#pop'),
 include('root')
 ],
-# Braced strings are not allowed in Csound scores, but this is needed
+# Braced strings are not allowed in Csound scores, but this is needed because the
-# because the superclass includes it.
+# superclass includes it.
 'braced string': [
 (r'\}\}', String, '#pop'),
 (r'[^}]|\}(?!\})', String)
 ]
 }
 class CsoundOrchestraLexer(CsoundLexer):
 """
-For `Csound <https://csound.github.io>`_ orchestras.
+For `Csound <https://csound.com>`_ orchestras.
 .. versionadded:: 2.1
 """
 name = 'Csound Orchestra'
 opcode = match.group(0)
 lexer.user_defined_opcodes.add(opcode)
 yield match.start(), Name.Function, opcode
 def name_callback(lexer, match):
+type_annotation_token = Keyword.Type
 name = match.group(1)
 if name in OPCODES or name in DEPRECATED_OPCODES:
 yield match.start(), Name.Builtin, name
-if match.group(2):
-yield match.start(2), Punctuation, match.group(2)
-yield match.start(3), Keyword.Type, match.group(3)
 elif name in lexer.user_defined_opcodes:
 yield match.start(), Name.Function, name
 else:
-nameMatch = re.search(r'^(g?[afikSw])(\w+)', name)
+type_annotation_token = Name
-if nameMatch:
+name_match = re.search(r'^(g?[afikSw])(\w+)', name)
-yield nameMatch.start(1), Keyword.Type, nameMatch.group(1)
+if name_match:
-yield nameMatch.start(2), Name, nameMatch.group(2)
+yield name_match.start(1), Keyword.Type, name_match.group(1)
+yield name_match.start(2), Name, name_match.group(2)
 else:
 yield match.start(), Name, name
-if match.group(2):
-yield match.start(2), Punctuation, match.group(2)
+if match.group(2):
-yield match.start(3), Name, match.group(3)
+yield match.start(2), Punctuation, match.group(2)
+yield match.start(3), type_annotation_token, match.group(3)
 tokens = {
 'root': [
 (r'\n', Text),
 'escape sequences': [
 # https://github.com/csound/csound/search?q=unquote_string+path%3AEngine+filename%3Acsound_orc_compile.c
 (r'\\(?:[\\abnrt"]|[0-7]{1,3})', String.Escape)
 ],
 # Format specifiers are highlighted in all strings, even though only
-#   fprintks        https://csound.github.io/docs/manual/fprintks.html
+#   fprintks        https://csound.com/docs/manual/fprintks.html
-#   fprints         https://csound.github.io/docs/manual/fprints.html
+#   fprints         https://csound.com/docs/manual/fprints.html
-#   printf/printf_i https://csound.github.io/docs/manual/printf.html
+#   printf/printf_i https://csound.com/docs/manual/printf.html
-#   printks         https://csound.github.io/docs/manual/printks.html
+#   printks         https://csound.com/docs/manual/printks.html
-#   prints          https://csound.github.io/docs/manual/prints.html
+#   prints          https://csound.com/docs/manual/prints.html
-#   sprintf         https://csound.github.io/docs/manual/sprintf.html
+#   sprintf         https://csound.com/docs/manual/sprintf.html
-#   sprintfk        https://csound.github.io/docs/manual/sprintfk.html
+#   sprintfk        https://csound.com/docs/manual/sprintfk.html
-# work with strings that contain format specifiers. In addition, these
+# work with strings that contain format specifiers. In addition, these opcodes’
-# opcodes’ handling of format specifiers is inconsistent:
+# handling of format specifiers is inconsistent:
 #   - fprintks, fprints, printks, and prints do accept %a and %A
 #     specifiers, but can’t accept %s specifiers.
 #   - printf, printf_i, sprintf, and sprintfk don’t accept %a and %A
 #     specifiers, but can accept %s specifiers.
 # See https://github.com/csound/csound/issues/747 for more information.
 include('quoted string')
 ],
 'Csound score opcode': [
 include('whitespace and macro uses'),
+(r'"', String, 'quoted string'),
 (r'\{\{', String, 'Csound score'),
 (r'\n', Text, '#pop')
 ],
 'Csound score': [
 (r'\}\}', String, '#pop'),
 (r'([^}]+)|\}(?!\})', using(CsoundScoreLexer))
 ],
 'Python opcode': [
 include('whitespace and macro uses'),
+(r'"', String, 'quoted string'),
 (r'\{\{', String, 'Python'),
 (r'\n', Text, '#pop')
 ],
 'Python': [
 (r'\}\}', String, '#pop'),
 (r'([^}]+)|\}(?!\})', using(PythonLexer))
 ],
 'Lua opcode': [
 include('whitespace and macro uses'),
+(r'"', String, 'quoted string'),
 (r'\{\{', String, 'Lua'),
 (r'\n', Text, '#pop')
 ],
 'Lua': [
 (r'\}\}', String, '#pop'),
 }
 class CsoundDocumentLexer(RegexLexer):
 """
-For `Csound <https://csound.github.io>`_ documents.
+For `Csound <https://csound.com>`_ documents.
 .. versionadded:: 2.1
 """
 name = 'Csound Document'

Mercurial Repositories > eric / file comparison

comparison: eric6/ThirdParty/Pygments/pygments/lexers/csound.py

eric6/ThirdParty/Pygments/pygments/lexers/csound.py