eric: comparison ThirdParty/Pygments/pygments/lexers/praat.py

-:f0d08bdeacf4
+:6762afd9f963
 pygments.lexers.praat
 ~~~~~~~~~~~~~~~~~~~~~
 Lexer for Praat
-:copyright: Copyright 2006-2015 by the Pygments team, see AUTHORS.
+:copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
 :license: BSD, see LICENSE for details.
 """
 from pygments.lexer import RegexLexer, words, bygroups, include
 from pygments.token import Name, Text, Comment, Keyword, String, Punctuation, Number, \
 name = 'Praat'
 aliases = ['praat']
 filenames = ['*.praat', '*.proc', '*.psc']
-keywords = [
+keywords = (
 'if', 'then', 'else', 'elsif', 'elif', 'endif', 'fi', 'for', 'from', 'to',
 'endfor', 'endproc', 'while', 'endwhile', 'repeat', 'until', 'select', 'plus',
 'minus', 'demo', 'assert', 'stopwatch', 'nocheck', 'nowarn', 'noprogress',
 'editor', 'endeditor', 'clearinfo',
-]
+)
-functions_string = [
+functions_string = (
 'backslashTrigraphsToUnicode', 'chooseDirectory', 'chooseReadFile',
 'chooseWriteFile', 'date', 'demoKey', 'do', 'environment', 'extractLine',
 'extractWord', 'fixed', 'info', 'left', 'mid', 'percent', 'readFile', 'replace',
 'replace_regex', 'right', 'selected', 'string', 'unicodeToBackslashTrigraphs',
-]
+)
-functions_numeric = [
+functions_numeric = (
 'abs', 'appendFile', 'appendFileLine', 'appendInfo', 'appendInfoLine', 'arccos',
 'arccosh', 'arcsin', 'arcsinh', 'arctan', 'arctan2', 'arctanh', 'barkToHertz',
 'beginPause', 'beginSendPraat', 'besselI', 'besselK', 'beta', 'beta2',
 'binomialP', 'binomialQ', 'boolean', 'ceiling', 'chiSquareP', 'chiSquareQ',
 'choice', 'comment', 'cos', 'cosh', 'createDirectory', 'deleteFile',
 'round', 'runScript', 'runSystem', 'runSystem_nocheck', 'selectObject',
 'selected', 'semitonesToHertz', 'sentencetext', 'sigmoid', 'sin', 'sinc',
 'sincpi', 'sinh', 'soundPressureToPhon', 'sqrt', 'startsWith', 'studentP',
 'studentQ', 'tan', 'tanh', 'variableExists', 'word', 'writeFile', 'writeFileLine',
 'writeInfo', 'writeInfoLine',
-]
+)
-functions_array = [
+functions_array = (
 'linear', 'randomGauss', 'randomInteger', 'randomUniform', 'zero',
-]
+)
-objects = [
+objects = (
 'Activation', 'AffineTransform', 'AmplitudeTier', 'Art', 'Artword',
 'Autosegment', 'BarkFilter', 'BarkSpectrogram', 'CCA', 'Categories',
 'Cepstrogram', 'Cepstrum', 'Cepstrumc', 'ChebyshevSeries', 'ClassificationTable',
 'Cochleagram', 'Collection', 'ComplexSpectrogram', 'Configuration', 'Confusion',
 'ContingencyTable', 'Corpus', 'Correlation', 'Covariance',
 'Similarity', 'SimpleString', 'SortedSetOfString', 'Sound', 'Speaker',
 'Spectrogram', 'Spectrum', 'SpectrumTier', 'SpeechSynthesizer', 'SpellingChecker',
 'Strings', 'StringsIndex', 'Table', 'TableOfReal', 'TextGrid', 'TextInterval',
 'TextPoint', 'TextTier', 'Tier', 'Transition', 'VocalTract', 'VocalTractTier',
 'Weight', 'WordList',
-]
+)
-variables_numeric = [
+variables_numeric = (
 'macintosh', 'windows', 'unix', 'praatVersion', 'pi', 'e', 'undefined',
-]
+)
-variables_string = [
+variables_string = (
 'praatVersion', 'tab', 'shellDirectory', 'homeDirectory',
 'preferencesDirectory', 'newline', 'temporaryDirectory',
 'defaultDirectory',
-]
+)
 tokens = {
 'root': [
 (r'(\s+)(#.*?$)',  bygroups(Text, Comment.Single)),
 (r'^#.*?$',        Comment.Single),
 'command': [
 (r'( ?[\w()-]+ ?)', Keyword),
 (r"'(?=.*')", String.Interpol, 'string_interpolated'),
 (r'\.{3}', Keyword, ('#pop', 'old_arguments')),
 (r':', Keyword, ('#pop', 'comma_list')),
-(r'[\s\n]', Text, '#pop'),
+(r'\s', Text, '#pop'),
 ],
 'procedure_call': [
 (r'\s+', Text),
 (r'([\w.]+)(:|\s*\()',
 bygroups(Name.Function, Text), '#pop'),
 (r'([\w.]+)([^\n]*)',
 bygroups(Name.Function, Text), '#pop'),
 ],
 'function_call': [
 (words(functions_string, suffix=r'\$(?=\s*[:(])'), Name.Function, 'function'),
-(words(functions_array, suffix=r'#(?=\s*[:(])'), Name.Function, 'function'),
+(words(functions_array, suffix=r'#(?=\s*[:(])'),   Name.Function, 'function'),
-(words(functions_numeric, suffix=r'(?=\s*[:(])'), Name.Function, 'function'),
+(words(functions_numeric, suffix=r'(?=\s*[:(])'),  Name.Function, 'function'),
 ],
 'function': [
 (r'\s+',   Text),
 (r':',     Punctuation, ('#pop', 'comma_list')),
 (r'\s*\(', Punctuation, ('#pop', 'comma_list')),
 include('function_call'),
 include('variable_name'),
 include('operator'),
 include('number'),
+(r'[()]', Text),
 (r',', Punctuation),
 ],
 'old_arguments': [
 (r'\n', Text, '#pop'),
 (r'"', String, 'string'),
 (r'[^\n]', Text),
 ],
 'number': [
+(r'\n', Text, '#pop'),
 (r'\b\d+(\.\d*)?([eE][-+]?\d+)?%?', Number),
 ],
 'object_attributes': [
 (r'\.?(n(col|row)|[xy]min|[xy]max|[nd][xy])\b', Name.Builtin, '#pop'),
 (r'(\.?(?:col|row)\$)(\[)',
 ('object_attributes', 'string_interpolated')),
 (words(objects, prefix=r'\b', suffix=r"(_)(')"),
 bygroups(Name.Builtin, Name.Builtin, String.Interpol),
 ('object_attributes', 'string_interpolated')),
-(r'\.?_?[a-z][a-zA-Z0-9_.]*(\$|#)?', Text),
+(r'\.?_?[a-z][\w.]*(\$|#)?', Text),
 (r'[\[\]]', Punctuation, 'comma_list'),
 (r"'(?=.*')", String.Interpol, 'string_interpolated'),
 ],
 'operator': [
-(r'([+\/*<>=!-]=?|[&*|][&*|]?|\^|<>)', Operator),
+(r'([+\/*<>=!-]=?|[&*|][&*|]?|\^|<>)',       Operator),
-(r'\b(and|or|not|div|mod)\b',          Operator.Word),
+(r'(?<![\w.])(and|or|not|div|mod)(?![\w.])', Operator.Word),
 ],
 'string_interpolated': [
-(r'\.?[_a-z][a-zA-Z0-9_.]*[\$#]?(?:\[[a-zA-Z0-9,]+\])?(:[0-9]+)?',
+(r'\.?[_a-z][\w.]*[$#]?(?:\[[a-zA-Z0-9,]+\])?(:[0-9]+)?',
 String.Interpol),
 (r"'",          String.Interpol, '#pop'),
 ],
 'string_unquoted': [
 (r'(\n\s*)(\.{3})', bygroups(Text, Punctuation)),
 (r'(optionmenu|choice)([ \t]+\S+:[ \t]+)',
 bygroups(Keyword, Text), 'number'),
 (r'(option|button)([ \t]+)',
-bygroups(Keyword, Text), 'number'),
-(r'(option|button)([ \t]+)',
 bygroups(Keyword, Text), 'string_unquoted'),
 (r'(sentence|text)([ \t]+\S+)',
 bygroups(Keyword, Text), 'string_unquoted'),

Mercurial Repositories > eric / file comparison

comparison: ThirdParty/Pygments/pygments/lexers/praat.py

ThirdParty/Pygments/pygments/lexers/praat.py