diff options
| -rwxr-xr-x | external/lasso-builtins-generator-9.lasso | 24 | ||||
| -rw-r--r-- | pygments/lexers/_lassobuiltins.py | 8 | ||||
| -rw-r--r-- | pygments/lexers/web.py | 18 |
3 files changed, 25 insertions, 25 deletions
diff --git a/external/lasso-builtins-generator-9.lasso b/external/lasso-builtins-generator-9.lasso index 3fa0bd12..6a619106 100755 --- a/external/lasso-builtins-generator-9.lasso +++ b/external/lasso-builtins-generator-9.lasso @@ -5,10 +5,10 @@ This is the shell script that was used to extract Lasso 9's built-in keywords and generate most of the _lassobuiltins.py file. When run, it creates a file - named "lassobuiltins-9.py" containing the types, traits, and methods of the - currently-installed version of Lasso 9. + named "lassobuiltins-9.py" containing the types, traits, methods, and members + of the currently-installed version of Lasso 9. - A partial list of keywords in Lasso 8 can be generated with this code: + A list of tags in Lasso 8 can be generated with this code: <?LassoScript local('l8tags' = list, @@ -38,7 +38,7 @@ local(f) = file("lassobuiltins-9.py") pygments.lexers._lassobuiltins ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - Built-in Lasso types, traits, and methods. + Built-in Lasso types, traits, methods, and members. :copyright: Copyright 2006-'+date->year+' by the Pygments team, see AUTHORS. :license: BSD, see LICENSE for details. @@ -71,7 +71,7 @@ local( typesList = list(), traitsList = list(), unboundMethodsList = list(), - methodsList = list() + memberMethodsList = list() ) // types @@ -83,8 +83,8 @@ do { let name = #method->methodName where not #name->asString->endsWith('=') // skip setter methods where #name->asString->isAlpha(1) // skip unpublished methods - where #methodsList !>> #name - do #methodsList->insert(#name) + where #memberMethodsList !>> #name + do #memberMethodsList->insert(#name) } // traits @@ -97,8 +97,8 @@ do { let name = #method->methodName where not #name->asString->endsWith('=') // skip setter methods where #name->asString->isAlpha(1) // skip unpublished methods - where #methodsList !>> #name - do #methodsList->insert(#name) + where #memberMethodsList !>> #name + do #memberMethodsList->insert(#name) } // unbound methods @@ -131,10 +131,10 @@ do #f->writeString(" '"+string_lowercase(#t->asString)+"',\n") #f->writeString(" ] } -METHODS = { - 'Methods': [ +MEMBERS = { + 'Member Methods': [ ") -with t in #methodsList +with t in #memberMethodsList do #f->writeString(" '"+string_lowercase(#t->asString)+"',\n") #f->writeString(" ] diff --git a/pygments/lexers/_lassobuiltins.py b/pygments/lexers/_lassobuiltins.py index ecc9cca6..f3e5147e 100644 --- a/pygments/lexers/_lassobuiltins.py +++ b/pygments/lexers/_lassobuiltins.py @@ -3,7 +3,7 @@ pygments.lexers._lassobuiltins ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - Built-in Lasso types, traits, and methods. + Built-in Lasso types, traits, methods, and members. :copyright: Copyright 2006-2013 by the Pygments team, see AUTHORS. :license: BSD, see LICENSE for details. @@ -3029,8 +3029,8 @@ BUILTINS = { 'xsd_type' ] } -METHODS = { - 'Methods': [ +MEMBERS = { + 'Member Methods': [ 'escape_member', 'oncompare', 'sameas', @@ -4711,7 +4711,7 @@ METHODS = { 'csscontent', 'jscontent' ], - 'Lasso 8 Members': [ + 'Lasso 8 Member Tags': [ 'accept', 'add', 'addattachment', diff --git a/pygments/lexers/web.py b/pygments/lexers/web.py index 38d61222..02bb8fec 100644 --- a/pygments/lexers/web.py +++ b/pygments/lexers/web.py @@ -3106,8 +3106,8 @@ class LassoLexer(RegexLexer): Additional options accepted: `builtinshighlighting` - If given and ``True``, highlight builtin tags, types, traits, and - methods (default: ``True``). + If given and ``True``, highlight builtin types, traits, methods, and + members (default: ``True``). `requiredelimiters` If given and ``True``, only highlight code between delimiters as Lasso (default: ``False``). @@ -3192,8 +3192,8 @@ class LassoLexer(RegexLexer): (r"(self)(\s*->\s*)('[a-z_][\w.]*')", bygroups(Name.Builtin.Pseudo, Operator, Name.Variable.Class)), (r'(\.\.?)([a-z_][\w.]*)', - bygroups(Name.Builtin.Pseudo, Name.Other.Method)), - (r'(->\s*)([a-z_][\w.]*)', bygroups(Operator, Name.Other.Method)), + bygroups(Name.Builtin.Pseudo, Name.Other.Member)), + (r'(->\s*)([a-z_][\w.]*)', bygroups(Operator, Name.Other.Member)), (r'(self|inherited|global|void)\b', Name.Builtin.Pseudo), (r'-[a-z_][\w.]*', Name.Attribute), (r'(::\s*)([a-z_][\w.]*)', bygroups(Punctuation, Name.Label)), @@ -3315,13 +3315,13 @@ class LassoLexer(RegexLexer): options, 'requiredelimiters', False) self._builtins = set() - self._methods = set() + self._members = set() if self.builtinshighlighting: - from pygments.lexers._lassobuiltins import BUILTINS, METHODS + from pygments.lexers._lassobuiltins import BUILTINS, MEMBERS for key, value in BUILTINS.iteritems(): self._builtins.update(value) - for key, value in METHODS.iteritems(): - self._methods.update(value) + for key, value in MEMBERS.iteritems(): + self._members.update(value) RegexLexer.__init__(self, **options) def get_tokens_unprocessed(self, text): @@ -3331,7 +3331,7 @@ class LassoLexer(RegexLexer): for index, token, value in \ RegexLexer.get_tokens_unprocessed(self, text, stack): if (token is Name.Other and value.lower() in self._builtins or - token is Name.Other.Method and value.lower() in self._methods): + token is Name.Other.Member and value.lower() in self._members): yield index, Name.Builtin, value continue yield index, token, value |